Attachment 7545 Details for Bug 8915 – Patch to fix the build

[patch] Patch to fix the build

0001-s3-pam_winbind-Fix-the-build.patch (text/plain), 1.19 KB, created by Karolin Seeger on 2012-05-10 07:57:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2012-05-10 07:57:11 UTC

Size: 1.19 KB

patch

obsolete

>From c0ccc1ca29c4ca0e27dece034b7693d802c9b139 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 10 May 2012 09:53:57 +0200
>Subject: [PATCH] s3-pam_winbind: Fix the build.
>
>Jeremy
>---
> nsswitch/pam_winbind.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>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;
> 	}
>-- 
>1.7.1
>

Actions: View

Attachments on bug 8915: 7536 | 7537 | 7545