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

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

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

vendor/current/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;
@@ -832 +832 @@
         _pam_log(ctx, LOG_CRIT, "Received [%s] reply from application.\n", resp->resp);
 
-        if (strcasecmp(resp->resp, "yes") == 0) {
+        if ((resp->resp != NULL) && (strcasecmp(resp->resp, "yes") == 0)) {
                 retval = true;
         }
@@ -2064 +2064 @@
         switch (wbc_status) {
                 case WBC_ERR_UNKNOWN_USER:
+                /* match other insane libwbclient return codes */
+                case WBC_ERR_WINBIND_NOT_AVAILABLE:
+                case WBC_ERR_DOMAIN_NOT_FOUND:
                         return 1;
                 case WBC_ERR_SUCCESS:
@@ -2278 +2281 @@
                 }
 
-                parm_opt = iniparser_getstr(ctx->dict, key);
+                parm_opt = iniparser_getstring(ctx->dict, key, NULL);
                 TALLOC_FREE(key);