Attachment 7537 Details for Bug 8915 – Adopted patch

[patch] Adopted patch

0001-Fix-pam_winbind-build-against-newer-iniparser-librar.patch (text/plain), 1.70 KB, created by Karolin Seeger on 2012-05-09 11:58:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2012-05-09 11:58:49 UTC

Size: 1.70 KB

patch

obsolete

>From 9c81bc13ccedf15d3b019a3a124ddbdc85117005 Mon Sep 17 00:00:00 2001
>From: Simo Sorce <idra@samba.org>
>Date: Wed, 9 May 2012 13:55:41 +0200
>Subject: [PATCH] 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@samba.org>
>Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
>---
> nsswitch/pam_winbind.c |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
>index 7005c25..1ab2cbf 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;
> 	}
>@@ -2277,7 +2277,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",
>-- 
>1.7.1
>

Flags:

gd: review+

Actions: View

Attachments on bug 8915: 7536 | 7537 | 7545