--- samba-3.0.11pre2/source/nsswitch/pam_winbind.c.orig	Sun Jan 23 16:01:44 2005
+++ samba-3.0.11pre2/source/nsswitch/pam_winbind.c	Sun Jan 23 17:06:51 2005
@@ -660,21 +660,8 @@
 		/* verify that this is the password for this user */
 		
 		retval = winbind_auth_request(user, pass_old, member, ctrl);
-		
-		if (retval != PAM_ACCT_EXPIRED 
-		    && retval != PAM_AUTHTOK_EXPIRED
-		    && retval != PAM_NEW_AUTHTOK_REQD 
-		    && retval != PAM_SUCCESS) {
-			pass_old = NULL;
-			return retval;
-		}
-		
-		retval = pam_set_item(pamh, PAM_OLDAUTHTOK, (const void *) pass_old);
+
 		pass_old = NULL;
-		if (retval != PAM_SUCCESS) {
-			_pam_log(LOG_CRIT, 
-				 "failed to set PAM_OLDAUTHTOK");
-		}
 	} else if (flags & PAM_UPDATE_AUTHTOK) {
 	
 		/*