Changeset 736 for branches/samba-3.5.x/nsswitch

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

Location:

branches/samba-3.5.x/nsswitch

Files:

• pam_winbind.c (modified) (2 diffs)
• winbind_krb5_locator.c (modified) (4 diffs)
• winbind_nss_hpux.h (modified) (1 diff)

branches/samba-3.5.x/nsswitch/pam_winbind.c

@@ -438 +438 @@
         }
 
-        if (iniparser_getstr(d, CONST_DISCARD(char *, "global:krb5_ccache_type")) != NULL) {
+        if (iniparser_getstring(d, CONST_DISCARD(char *, "global:krb5_ccache_type"), NULL) != NULL) {
                 ctrl |= WINBIND_KRB5_CCACHE_TYPE;
         }
 
-        if ((iniparser_getstr(d, CONST_DISCARD(char *, "global:require-membership-of"))
+        if ((iniparser_getstring(d, CONST_DISCARD(char *, "global:require-membership-of"), NULL)
              != NULL) ||
-            (iniparser_getstr(d, CONST_DISCARD(char *, "global:require_membership_of"))
+            (iniparser_getstring(d, CONST_DISCARD(char *, "global:require_membership_of"), NULL)
              != NULL)) {
                 ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
@@ -2291 +2291 @@
                 }
 
-                parm_opt = iniparser_getstr(ctx->dict, key);
+                parm_opt = iniparser_getstring(ctx->dict, key, NULL);
                 TALLOC_FREE(key);
 

branches/samba-3.5.x/nsswitch/winbind_krb5_locator.c

@@ -183 +183 @@
 {
         struct addrinfo *out = NULL;
-        int ret;
+        int ret = 0;
+        struct addrinfo *res = NULL;
         int count = 3;
 
@@ -207 +208 @@
         }
 
-        ret = cbfunc(cbdata, out->ai_socktype, out->ai_addr);
-#ifdef DEBUG_KRB5
-        if (ret) {
-                fprintf(stderr, "[%5u]: smb_krb5_locator_lookup: "
-                        "failed to call callback: %s (%d)\n",
-                        (unsigned int)getpid(), error_message(ret), ret);
-        }
-#endif
-
-        freeaddrinfo(out);
+        for (res = out; res; res = res->ai_next) {
+                if (!res->ai_addr || res->ai_addrlen == 0) {
+                        continue;
+                }
+
+                ret = cbfunc(cbdata, res->ai_socktype, res->ai_addr);
+                if (ret) {
+#ifdef DEBUG_KRB5
+                        fprintf(stderr, "[%5u]: smb_krb5_locator_lookup: "
+                                "failed to call callback: %s (%d)\n",
+                                (unsigned int)getpid(), error_message(ret), ret);
+#endif
+                        break;
+                }
+        }
+
+        if (out) {
+                freeaddrinfo(out);
+        }
         return ret;
 }
@@ -258 +268 @@
         flags = WBC_LOOKUP_DC_KDC_REQUIRED |
                 WBC_LOOKUP_DC_IS_DNS_NAME |
-                WBC_LOOKUP_DC_RETURN_DNS_NAME |
-                WBC_LOOKUP_DC_IP_REQUIRED;
+                WBC_LOOKUP_DC_RETURN_DNS_NAME;
 
         wbc_status = wbcLookupDomainControllerEx(realm, NULL, NULL, flags, &dc_info);
@@ -269 +278 @@
 #endif
                 return false;
-        }
-
-        if (dc_info->dc_address) {
-                dc = dc_info->dc_address;
-                if (dc[0] == '\\') dc++;
-                if (dc[0] == '\\') dc++;
         }
 

branches/samba-3.5.x/nsswitch/winbind_nss_hpux.h

@@ -131 +131 @@
         void *returnval;
         int erange;
-        int h_errno;
+        /*
+        *  h_errno is defined as function call macro for multithreaded applications
+        *  in HP-UX. *this* h_errno is not used in the HP-UX codepath of our nss
+        *  modules, so let's simply comment it out here:
+        * int h_errno;
+        */
         nss_status_t status;
 } nss_XbyY_args_t;