diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-03-03 20:48:48 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-03-03 20:48:48 +0000 |
| commit | 00d86ccb1cceda0381383420bdbfd452456c7545 (patch) | |
| tree | 758e736573f21b3a9882ffcbf3335800f29a120b /source3/passdb/passdb.c | |
| parent | 81f866db3ab86a27dc93148676da6c96b6e56cbf (diff) | |
| download | samba-00d86ccb1cceda0381383420bdbfd452456c7545.tar.gz samba-00d86ccb1cceda0381383420bdbfd452456c7545.tar.bz2 samba-00d86ccb1cceda0381383420bdbfd452456c7545.zip | |
Benjamin Kuit's latest mysql mods. issue with "make proto" needs to be
resolved.
(This used to be commit d59a2e669aed7ee33fdca8b8ec126b1c0a984981)
Diffstat (limited to 'source3/passdb/passdb.c')
| -rw-r--r-- | source3/passdb/passdb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 9936dd2293..39caef2f85 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -70,7 +70,7 @@ BOOL initialise_password_db(void) pwdb_ops = nisplus_initialise_password_db(); #elif defined(WITH_LDAP) pwdb_ops = ldap_initialise_password_db(); -#elif defined(WITH_MYSQL) || defined(WITH_MYSQLSAM) +#elif defined(HAVE_MYSQL_H) && defined(WITH_MYSQLSAM) pwdb_ops = mysql_initialise_password_db(); #elif defined(USE_SMBPASS_DB) pwdb_ops = file_initialise_password_db(); @@ -278,6 +278,11 @@ struct smb_passwd *pwdb_smb_map_names(struct smb_passwd *smb) { return NULL; } + if (smb->unix_name != NULL && smb->nt_name != NULL && + smb->unix_uid != (uid_t)-1 && smb->user_rid != 0xffffffff) + { + return smb; + } if (!found && smb->unix_name != NULL) { |