diff options
| author | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
| commit | 1e6e5b299c235b513095a76a4cd9fffc41e8fc9c (patch) | |
| tree | 9f741529073ad411cc7328334e26d3e35b1d33f1 /source/passdb/passdb.c | |
| parent | a11c5d7ad07d259d764aede4745d13f8163a8212 (diff) | |
| download | samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.gz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.xz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.zip | |
beginning to sync up for 2.2.5 release....
Diffstat (limited to 'source/passdb/passdb.c')
| -rw-r--r-- | source/passdb/passdb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index a043a355347..512735fdd8d 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -737,7 +737,7 @@ BOOL local_sid_to_gid(gid_t *pgid, DOM_SID *psid, enum SID_NAME_USE *name_type) static void select_name(pstring string, const UNISTR2 *from) { if (from->buffer != 0) - unistr2_to_ascii(string, from, sizeof(pstring)); + unistr2_to_dos(string, from, sizeof(pstring)); } /************************************************************* @@ -900,7 +900,7 @@ account without a valid local system user.\n", user_name); } sam_pass = NULL; - if (!pdb_init_sam_pw(&sam_pass, pwd)) { + if (!pdb_init_sam_pw(&sam_pass, sys_getpwnam(user_name))) { return False; } @@ -1729,7 +1729,8 @@ BOOL pdb_getsampwuid (SAM_ACCOUNT* user, uid_t uid) */ if ((pw=sys_getpwuid(uid)) == NULL) { - DEBUG(0,("pdb_getsampwuid: getpwuid(%d) return NULL. User does not exist in Unix accounts!\n", uid)); + DEBUG(0,("pdb_getsampwuid: getpwuid(%u) return NULL. User does not exist in Unix accounts!\n", + (unsigned int)uid)); return False; } |