Latest iniparser commit to v3-6-test has broken the build.

[Jeremy Allison]

Hi Karolin and Simo,

This commit :

uthor: Simo Sorce <idra at samba.org>
Date:   Wed May 9 13:55:41 2012 +0200

    Fix pam_winbind build against newer iniparser library.
    
    iniparser_getstr is deprecated and has been removed in newer libraries
    available in Fedora. Use iniparse_getstring instead.
    
    Autobuild-User: Simo Sorce <idra at samba.org>
    Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
    
    Based on commit adbace20a24b6ae4fbd6d17b7153833f4ac8c88d in master.


has broken the v3-6-test build.

The reason is obvious : it replaces in 2 places :

iniparser_getstr(d, key)

with :

iniparser_getstring(d, key).

Unfortunately the function signature for iniparser_getstring()
is :

iniparser_getstring(d, key, def)

I've attached the correct fix - but there's no reference
to the bugid that this change fixed. Can you find the bug
report and add this as an (obvious) fix please ?

Cheers,

	Jeremy.
-------------- next part --------------
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 1ab2cbf..11599da 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;
 	}