Changeset 862 for trunk/server/nsswitch/wbinfo.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• nsswitch/wbinfo.c (modified) (4 diffs)

trunk/server/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);
 }