s3-pam_winbind: Fix the build.
authorJeremy Allison <jra@samba.org>
Thu, 10 May 2012 07:53:57 +0000 (09:53 +0200)
committerKarolin Seeger <kseeger@samba.org>
Sat, 30 Jun 2012 11:43:29 +0000 (13:43 +0200)
Jeremy

Part of a fix for bug #8915 (Samba fails to build with iniparser-3.0.0 and
iniparser-3.1.0).
(cherry picked from commit 00c901a5be83bfe4c70eccbe7fa2a35d3d2a368d)
(cherry picked from commit 19fc7d6733a61417477dcc4b53a24a0c1bc40187)

nsswitch/pam_winbind.c

index a344186f067c1617e635ef0e8ddd859682294100..caae5896c45ca3f69d113940bf2ee4bef1ff0de9 100644 (file)
@@ -437,13 +437,13 @@ static int _pam_parse(const pam_handle_t *pamh,
                ctrl |= WINBIND_SILENT;
        }
 
-       if (iniparser_getstring(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_getstring(d, CONST_DISCARD(char *, "global:require-membership-of"))
+       if ((iniparser_getstring(d, CONST_DISCARD(char *, "global:require-membership-of"), NULL)
             != NULL) ||
-           (iniparser_getstring(d, CONST_DISCARD(char *, "global:require_membership_of"))
+           (iniparser_getstring(d, CONST_DISCARD(char *, "global:require_membership_of"), NULL)
             != NULL)) {
                ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
        }