svn commit: samba r12420 - in trunk/source/nsswitch: .

gd at samba.org gd at samba.org
Thu Dec 22 01:19:44 GMT 2005


Author: gd
Date: 2005-12-22 01:19:42 +0000 (Thu, 22 Dec 2005)
New Revision: 12420

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12420

Log:
Fix BOOL mixup in pam_winbind that caused a pam conversation to fail.

Guenther

Modified:
   trunk/source/nsswitch/pam_winbind.c


Changeset:
Modified: trunk/source/nsswitch/pam_winbind.c
===================================================================
--- trunk/source/nsswitch/pam_winbind.c	2005-12-22 01:08:39 UTC (rev 12419)
+++ trunk/source/nsswitch/pam_winbind.c	2005-12-22 01:19:42 UTC (rev 12420)
@@ -509,7 +509,7 @@
 	/* TODO: tell the history length ? */
 	PAM_WB_REMARK_CHECK_RESPONSE(pamh, response, "NT_STATUS_PWD_HISTORY_CONFLICT");
 
-	if (strequal(response.data.auth.nt_status_string, "NT_STATUS_PASSWORD_RESTRICTION") == 0) {
+	if (strequal(response.data.auth.nt_status_string, "NT_STATUS_PASSWORD_RESTRICTION")) {
 
 		_make_remark_format(pamh, PAM_ERROR_MSG,  
 			"Your password must be at least %d characters; "
@@ -1110,7 +1110,7 @@
 		}
 		/* verify that this is the password for this user */
 		
-		retval = winbind_auth_request(pamh, ctrl, user, pass_old, NULL, NULL, True);
+		retval = winbind_auth_request(pamh, ctrl, user, pass_old, NULL, NULL, False);
 
 		if (retval != PAM_ACCT_EXPIRED 
 		    && retval != PAM_AUTHTOK_EXPIRED



More information about the samba-cvs mailing list