Changeset 221 for branches/samba-3.3.x/source/winbindd/winbindd_user.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/winbindd/winbindd_user.c (modified) (3 diffs)

branches/samba-3.3.x/source/winbindd/winbindd_user.c

@@ -81 +81 @@
                 return False;
 
+        domain = find_domain_from_name_noinit(dom_name);
+        if (domain == NULL) {
+                DEBUG(5,("winbindd_fill_pwent: Failed to find domain for %s.\n",
+                         dom_name));
+                nt_status = NT_STATUS_NO_SUCH_DOMAIN;
+                return false;
+        }
+
         /* Resolve the uid number */
 
-        if (!NT_STATUS_IS_OK(idmap_sid_to_uid(dom_name, user_sid,
+        if (!NT_STATUS_IS_OK(idmap_sid_to_uid(domain->have_idmap_config ?
+                                              dom_name : "", user_sid,
                                               &pw->pw_uid))) {
                 DEBUG(1, ("error getting user id for sid %s\n",
@@ -92 +101 @@
         /* Resolve the gid number */
 
-        if (!NT_STATUS_IS_OK(idmap_sid_to_gid(dom_name, group_sid,
+        if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config ?
+                                              dom_name : "", group_sid,
                                               &pw->pw_gid))) {
                 DEBUG(1, ("error getting group id for sid %s\n",
@@ -99 +109 @@
         }
 
+        /* Username */
+
         strlower_m(user_name);
-
-        /* Username */
-
-        domain = find_domain_from_name_noinit(dom_name);
-        if (domain) {
-                nt_status = normalize_name_map(ctx, domain, user_name,
-                                               &mapped_name);
-        } else {
-                DEBUG(5,("winbindd_fill_pwent: Failed to find domain for %s.  "
-                         "Disabling name alias support\n", dom_name));
-                nt_status = NT_STATUS_NO_SUCH_DOMAIN;
-        }
+        nt_status = normalize_name_map(ctx, domain, user_name, &mapped_name);
 
         /* Basic removal of whitespace */