Changeset 309 for branches/samba-3.3.x/source/nsswitch

Timestamp:

Aug 4, 2009, 8:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.7

File:

• branches/samba-3.3.x/source/nsswitch/pam_winbind.c (modified) (3 diffs)

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

@@ -915 +915 @@
         /* good catch from Ralf Haferkamp: an expiry of "never" is translated
          * to -1 */
-        if (policy->expire <= 0) {
+        if ((policy->expire == (int64_t)-1) ||
+            (policy->expire == 0)) {
                 return;
         }
@@ -2284 +2285 @@
         char *domain;
         char *name;
+        char *p;
 
         /* This cannot work when the winbind separator = @ */
@@ -2292 +2294 @@
         }
 
+        name = talloc_strdup(ctx, upn);
+        if (!name) {
+                return NULL;
+        }
+
+        if ((p = strchr(name, '@')) != NULL) {
+                *p = 0;
+                domain = p + 1;
+        }
+
         /* Convert the UPN to a SID */
 
-        wbc_status = wbcLookupName("", upn, &sid, &type);
+        wbc_status = wbcLookupName(domain, name, &sid, &type);
         if (!WBC_ERROR_IS_OK(wbc_status)) {
                 return NULL;