summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1999-07-14 06:52:48 +0000
committerAndrew Tridgell <tridge@samba.org>1999-07-14 06:52:48 +0000
commit4ffb5e498ac94d356c33367a8c3852b39d3d7ef9 (patch)
treecc185b2ef56b84a66c7f9e911b3b91373904c387
parent49b706039cc020726602b263b0d1c42115fa944d (diff)
downloadsamba-4ffb5e498ac94d356c33367a8c3852b39d3d7ef9.tar.gz
transfer minor fixes from the 2.0 branch
-rw-r--r--source/client/client.c4
-rw-r--r--source/lib/genrand.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/client/client.c b/source/client/client.c
index bccb8b3fc97..4f72386e9d2 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -695,8 +695,8 @@ static void do_get(char *rname,char *lname)
}
if (nread < size) {
- DEBUG (0, ("Short read when getting file %s. Only got %d bytes.\n",
- CNV_LANG(rname), nread));
+ DEBUG (0, ("Short read when getting file %s. Only got %ld bytes.\n",
+ CNV_LANG(rname), (long)nread));
}
free(data);
diff --git a/source/lib/genrand.c b/source/lib/genrand.c
index a2fd1e0860d..a9698d4cd1b 100644
--- a/source/lib/genrand.c
+++ b/source/lib/genrand.c
@@ -150,7 +150,7 @@ static uint32 do_reseed(unsigned char *md4_outbuf)
/* add in the root encrypted password. On any system where security is taken
seriously this will be secret */
- pw = getpwnam("root");
+ pw = sys_getpwnam("root");
if (pw && pw->pw_passwd) {
int i;
unsigned char md4_tmp[16];