diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-07-11 19:15:53 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-07-11 19:15:53 +0000 |
| commit | 4820c47801e381e23807f5cb117912c1de0b7aa9 (patch) | |
| tree | ba754190cc7bc297a0e642cf3edeceb8ea1398c3 /source3/passdb | |
| parent | d244f2d1c8b50b231abe490ebbad054bc5789407 (diff) | |
| download | samba-4820c47801e381e23807f5cb117912c1de0b7aa9.tar.gz samba-4820c47801e381e23807f5cb117912c1de0b7aa9.tar.bz2 samba-4820c47801e381e23807f5cb117912c1de0b7aa9.zip | |
NULL pwdb_xxx_map_names() parameter can be passed here (which is a bug
anyway!)
(This used to be commit 91d5bda9ad22c922a918f0942dcbff04202b9991)
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/passdb.c | 11 | ||||
| -rw-r--r-- | source3/passdb/sampassdb.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 3cb083bb76..6579d14351 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -276,16 +276,17 @@ struct smb_passwd *pwdb_smb_map_names(struct smb_passwd *smb) static fstring unix_name; static fstring nt_name; - DEBUG(10,("pwdb_smb_map_names: unix %s nt %s unix %d nt%d\n", - smb->unix_name != NULL ? smb->unix_name : "NULL", - smb->nt_name != NULL ? smb->nt_name : "NULL", - smb->unix_uid, smb->user_rid)); - if (smb == NULL) { + DEBUG(10,("pwdb_smb_map_names: NULL\n")); return NULL; } + DEBUG(10,("pwdb_smb_map_names: unix %s nt %s unix %d nt%d\n", + smb->unix_name != NULL ? smb->unix_name : "NULL", + smb->nt_name != NULL ? smb->nt_name : "NULL", + smb->unix_uid, smb->user_rid)); + if (smb->unix_name == NULL && smb->nt_name == NULL && smb->unix_uid == (uid_t)-1 && smb->user_rid == 0xffffffff) { diff --git a/source3/passdb/sampassdb.c b/source3/passdb/sampassdb.c index c784f786c5..3f1587e1ac 100644 --- a/source3/passdb/sampassdb.c +++ b/source3/passdb/sampassdb.c @@ -621,20 +621,21 @@ struct sam_passwd *pwdb_sam_map_names(struct sam_passwd *sam) static fstring unix_name; static fstring nt_name; - DEBUG(10,("pwdb_sam_map_names: unix %s nt %s unix %d nt%d\n", - sam->unix_name != NULL ? sam->unix_name : "NULL", - sam->nt_name != NULL ? sam->nt_name : "NULL", - sam->unix_uid, sam->user_rid)); - /* * name details */ if (sam == NULL) { + DEBUG(10,("pwdb_sam_map_names: NULL\n")); return NULL; } + DEBUG(10,("pwdb_sam_map_names: unix %s nt %s unix %d nt%d\n", + sam->unix_name != NULL ? sam->unix_name : "NULL", + sam->nt_name != NULL ? sam->nt_name : "NULL", + sam->unix_uid, sam->user_rid)); + if (!found && sam->unix_name != NULL) { found = lookupsmbpwnam(sam->unix_name, &gmep); |