[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  19fc7d6 s3-pam_winbind: Fix the build.
      from  76dcbb8 Fix pam_winbind build against newer iniparser library.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 19fc7d6733a61417477dcc4b53a24a0c1bc40187
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 10 09:53:57 2012 +0200

    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)

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/pam_winbind.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index a344186..caae589 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;
 	}


-- 
Samba Shared Repository