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

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

File:

• branches/samba-3.5.x/nsswitch/pam_winbind.c (modified) (2 diffs)

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);