From 19fc7d6733a61417477dcc4b53a24a0c1bc40187 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 10 May 2012 09:53:57 +0200 Subject: [PATCH] s3-pam_winbind: Fix the build. 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) --- nsswitch/pam_winbind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index a344186f067..caae5896c45 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -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; } -- 2.11.4.GIT