Changeset 860 for vendor/current/nsswitch

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

Location:

vendor/current/nsswitch

Files:

• libwbclient/wbc_sid.c (modified) (1 diff)
• pam_winbind.c (modified) (3 diffs)
• wb_common.c (modified) (1 diff)
• wbinfo.c (modified) (4 diffs)

vendor/current/nsswitch/libwbclient/wbc_sid.c

@@ -422 +422 @@
 
                 names[i].domain_index = strtoul(p, &q, 10);
+                if (names[i].domain_index < 0) {
+                        goto wbc_err_invalid;
+                }
+                if (names[i].domain_index >= num_domains) {
+                        goto wbc_err_invalid;
+                }
+
                 if (*q != ' ') {
                         goto wbc_err_invalid;

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;

vendor/current/nsswitch/wb_common.c

@@ -393 +393 @@
 
                 pfd.fd = winbindd_fd;
-                pfd.events = POLLIN|POLLHUP;
-
-                ret = poll(&pfd, 1, 0);
+                pfd.events = POLLIN|POLLOUT|POLLHUP;
+
+                ret = poll(&pfd, 1, -1);
                 if (ret == -1) {
                         winbind_close_sock();

vendor/current/nsswitch/wbinfo.c

@@ -1381 +1381 @@
 
         for (i=0; i<num_sids; i++) {
+                const char *domain = NULL;
+
                 wbcSidToStringBuf(&sids[i], sidstr, sizeof(sidstr));
 
-                d_printf("%s -> %s\\%s %d\n", sidstr,
-                         domains[names[i].domain_index].short_name,
-                         names[i].name, names[i].type);
+                if (names[i].domain_index >= num_domains) {
+                        domain = "<none>";
+                } else if (names[i].domain_index < 0) {
+                        domain = "<none>";
+                } else {
+                        domain = domains[names[i].domain_index].short_name;
+                }
+
+                if (names[i].type == WBC_SID_NAME_DOMAIN) {
+                        d_printf("%s -> %s %d\n", sidstr,
+                                domain,
+                                names[i].type);
+                } else {
+                        d_printf("%s -> %s%c%s %d\n", sidstr,
+                                domain,
+                                winbind_separator(),
+                                names[i].name, names[i].type);
+                }
         }
         return true;
@@ -1729 +1746 @@
         wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
         struct wbcLogonUserParams params;
-        struct wbcAuthErrorInfo *error;
+        struct wbcAuthErrorInfo *error = NULL;
         char *s = NULL;
         char *p = NULL;
@@ -1780 +1797 @@
                  WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
 
-        if (!WBC_ERROR_IS_OK(wbc_status)) {
+        if (!WBC_ERROR_IS_OK(wbc_status) && (error != NULL)) {
                 d_fprintf(stderr,
                           "error code was %s (0x%x)\nerror message was: %s\n",
@@ -1787 +1804 @@
                           error->display_string);
                 wbcFreeMemory(error);
-                return false;
-        }
-        return true;
+        }
+        return WBC_ERROR_IS_OK(wbc_status);
 }