From 79a9f9da10b5918fdcf67dae699d50741fe35563 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 4 Feb 2005 00:25:33 +0000
Subject: r5207: patches from Jay Fenlason @ RedHat (scooped from their Fedora
 packages)

---
 source/nsswitch/pam_winbind.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/nsswitch/pam_winbind.c')

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index bfd8dd45ee5..ffe82b0bd26 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -4,7 +4,7 @@
    Copyright Tim Potter <tpot@samba.org> 2000
    Copyright Andrew Bartlett <abartlet@samba.org> 2002
 
-   largely based on pam_userdb by Christian Gafton <gafton@redhat.com> 
+   largely based on pam_userdb by Cristian Gafton <gafton@redhat.com> 
    also contains large slabs of code from pam_unix by Elliot Lee <sopwith@redhat.com>
    (see copyright below for full details)
 */
@@ -696,7 +696,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 		lctrl = ctrl;
 		
 		if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) {
-			ctrl = WINBIND_USE_FIRST_PASS_ARG | lctrl;
+			lctrl |= WINBIND_USE_FIRST_PASS_ARG;
 		}
 		retry = 0;
 		retval = PAM_AUTHTOK_ERR;
-- 
cgit