Changeset 590 for trunk/server/source3/winbindd/winbindd_pam.c

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

File:

• trunk/server/source3/winbindd/winbindd_pam.c (modified) (2 diffs)

trunk/server/source3/winbindd/winbindd_pam.c

@@ -802 +802 @@
 {
         struct winbindd_domain *domain;
-        fstring name_domain, name_user, mapped_user;
+        fstring name_domain, name_user;
         char *mapped = NULL;
         NTSTATUS result;
@@ -829 +829 @@
                                                &mapped);
 
-        /* If the name normalization didnt' actually do anything,
-           just use the original name */
-
-        if (NT_STATUS_IS_OK(name_map_status)
-            ||NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED)) {
-                fstrcpy(mapped_user, mapped);
-        } else {
-                fstrcpy(mapped_user, state->request->data.auth.user);
-        }
-
-        if (!canonicalize_username(mapped_user, name_domain, name_user)) {
+        /* Update the auth name if we did any mapping */
+
+        if (NT_STATUS_IS_OK(name_map_status) ||
+            NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED))
+        {
+                fstrcpy(state->request->data.auth.user, mapped);
+        }
+
+        if (!canonicalize_username(state->request->data.auth.user, name_domain, name_user)) {
                 result = NT_STATUS_NO_SUCH_USER;
                 goto done;