Changeset 860 for vendor/current/nsswitch/pam_winbind.c

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

• vendor/current/nsswitch/pam_winbind.c (modified) (3 diffs)

vendor/current/nsswitch/pam_winbind.c

@@ -1185 +1185 @@
                                 "to sid, please contact your administrator to see "
                                 "if group %s is valid."), search_location, search_location);
+
+                /* If no valid groups were converted we should fail outright */
+                if (name_list != NULL && strlen(sid_list_buffer) == 0) {
+                        result = false;
+                        goto out;
+                }
                 /*
                  * The lookup of the last name failed..
@@ -2449 +2455 @@
         }
 
-        return talloc_asprintf(ctx, "%s\\%s", domain, name);
+        return talloc_asprintf(ctx, "%s%c%s", domain, sep, name);
 }
 
@@ -2736 +2742 @@
         }
 
-        _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
-
-        TALLOC_FREE(ctx);
+        if (ctx != NULL) {
+                _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
+                TALLOC_FREE(ctx);
+        }
 
         return retval;