summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-07-08 17:04:11 +0000
committerGerald Carter <jerry@samba.org>2003-07-08 17:04:11 +0000
commit499b3e33153527420b3945b5eeb699e6b02d3420 (patch)
treee00209852c702ef532f4b7cd9065e1f0009ab8c7
parent0d0f89461edf95bc584423cca4de1915afe4ba90 (diff)
downloadsamba-499b3e33153527420b3945b5eeb699e6b02d3420.tar.gz
samba-499b3e33153527420b3945b5eeb699e6b02d3420.tar.bz2
samba-499b3e33153527420b3945b5eeb699e6b02d3420.zip
fix bone head mistake when setting the uid in the server_info struct.
(This used to be commit 43f21078ec0f885d4d1a0b90476b55f8f92de9e7)
-rw-r--r--source3/auth/auth_util.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 7d6a5ff8c9..d1c3b107e7 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -779,17 +779,9 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
(*server_info)->sam_account = sampass;
-#if 0 /* JERRY */
- /* disabled until winbindd_passdb is completed to prevent winbindd deadlock on a Samba PDC */
- if (!NT_STATUS_IS_OK(nt_status = sid_to_uid(pdb_get_user_sid(sampass), &((*server_info)->uid))))
- return nt_status;
-#endif
- if (!(pwd = getpwuid_alloc(((*server_info)->uid)))) {
- fstring sid;
- DEBUG(1, ("User %s in passdb (%s) maps to UID, but getpwuid(%u) fails!\n",
- pdb_get_username(sampass),
- sid_to_string(sid, pdb_get_user_sid(sampass)),
- (unsigned)(*server_info)->uid));
+ if ( !(pwd = getpwnam_alloc(pdb_get_username(sampass))) ) {
+ DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
+ pdb_get_username(sampass)));
free_server_info(server_info);
return NT_STATUS_NO_SUCH_USER;
}