fix bone head mistake when setting the uid in the server_info struct.

(This used to be commit 43f21078ec0f885d4d1a0b90476b55f8f92de9e7)

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 7d6a5ff8c9ee91c27e625d9808dbbb0420771d19..d1c3b107e771fe94fd06baccbee63d7d42aca565 100644 (file)
--- 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;
        }