Changeset 335 for branches/samba-3.2.x/source/nsswitch

Timestamp:

Sep 24, 2009, 9:15:13 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.14 (final)

File:

• branches/samba-3.2.x/source/nsswitch/pam_winbind.c (modified) (4 diffs)

branches/samba-3.2.x/source/nsswitch/pam_winbind.c

@@ -1911 +1911 @@
         int account_name_len;
         char sep;
+        char *p;
+        char *name;
+        char *domain;
 
         /* This cannot work when the winbind separator = @ */
@@ -1919 +1922 @@
         }
 
+        name = strdup(upn);
+        if (!name) {
+                return NULL;
+        }
+        if ((p = strchr(name, '@')) != NULL) {
+                *p = 0;
+                domain = p + 1;
+        }
+
         /* Convert the UPN to a SID */
 
@@ -1924 +1936 @@
         ZERO_STRUCT(resp);
 
-        strncpy(req.data.name.dom_name, "",
+        strncpy(req.data.name.dom_name, domain,
                 sizeof(req.data.name.dom_name) - 1);
-        strncpy(req.data.name.name, upn,
+        strncpy(req.data.name.name, name,
                 sizeof(req.data.name.name) - 1);
         retval = pam_winbind_request_log(ctx, WINBINDD_LOOKUPNAME,
@@ -1948 +1960 @@
                                     resp.data.name.dom_name,
                                     resp.data.name.name);
+        SAFE_FREE(name);
 
         return account_name;