Attachment 10487 Details for Bug 9056 – patch for 4.1

[patch] patch for 4.1

patch (text/plain), 1.72 KB, created by Guenther Deschner on 2014-12-04 22:52:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2014-12-04 22:52:41 UTC

Size: 1.72 KB

patch

obsolete

>From d35684710a70bf95863b88ab9a4ef05205bdb20c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Wed, 3 Dec 2014 16:55:39 +0100
>Subject: [PATCH] pam_winbind: fix warn_pwd_expire implementation.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=9056
>
>warn_pwd_expire parameter is not working as documented in pam_winbind manual
>page. This patch adds missing bit and allows disabling warning message fully,
>i.e. setting warn time to zero days.
>
>Guenther
>
>Signed-off-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Wed Dec  3 21:36:49 CET 2014 on sn-devel-104
>---
> nsswitch/pam_winbind.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
>index 98cf97e..b4baed0 100644
>--- a/nsswitch/pam_winbind.c
>+++ b/nsswitch/pam_winbind.c
>@@ -475,6 +475,9 @@ config_from_pam:
> 			ctrl |= WINBIND_CACHED_LOGIN;
> 		else if (!strcasecmp(*v, "mkhomedir"))
> 			ctrl |= WINBIND_MKHOMEDIR;
>+		else if (!strncasecmp(*v, "warn_pwd_expire",
>+				      strlen("warn_pwd_expire")))
>+			ctrl |= WINBIND_WARN_PWD_EXPIRE;
> 		else {
> 			__pam_log(pamh, ctrl, LOG_ERR,
> 				 "pam_parse: unknown option: %s", *v);
>@@ -2351,7 +2354,7 @@ static int get_warn_pwd_expire_from_config(struct pwb_context *ctx)
> 	ret = get_config_item_int(ctx, "warn_pwd_expire",
> 				  WINBIND_WARN_PWD_EXPIRE);
> 	/* no or broken setting */
>-	if (ret <= 0) {
>+	if (ret < 0) {
> 		return DEFAULT_DAYS_TO_WARN_BEFORE_PWD_EXPIRES;
> 	}
> 	return ret;
>-- 
>1.9.3
>

Flags:

asn: review+

Actions: View

Attachments on bug 9056: 10482 | 10483 | 10487