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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  76dcbb8 Fix pam_winbind build against newer iniparser library.
      from  f5d9428 s3-docs: Fix bug #7930.

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


- Log -----------------------------------------------------------------
commit 76dcbb84e3fa13959df5931d21051695327c29f4
Author: Simo Sorce <i...@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 <i...@samba.org>
    Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
    
    Based on commit adbace20a24b6ae4fbd6d17b7153833f4ac8c88d in master.
    (cherry picked from commit e295905f2840b5e814f88cd483b7f5f0fb3b4150)

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

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


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index b802036..a344186 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_getstr(d, CONST_DISCARD(char *, 
"global:krb5_ccache_type")) != NULL) {
+       if (iniparser_getstring(d, CONST_DISCARD(char *, 
"global:krb5_ccache_type")) != 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) ||
-           (iniparser_getstr(d, CONST_DISCARD(char *, 
"global:require_membership_of"))
+           (iniparser_getstring(d, CONST_DISCARD(char *, 
"global:require_membership_of"))
             != NULL)) {
                ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
        }
@@ -2290,7 +2290,7 @@ static const char *get_conf_item_string(struct 
pwb_context *ctx,
                        goto out;
                }
 
-               parm_opt = iniparser_getstr(ctx->dict, key);
+               parm_opt = iniparser_getstring,(ctx->dict, key, NULL);
                TALLOC_FREE(key);
 
                _pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",


-- 
Samba Shared Repository