--- xlockmore-5.18/xlock/passwd.c	2005-05-31 15:54:36.000000000 +0200
+++ xlockmore-5.16/xlock/passwd.c	2005-02-17 02:24:50.000000000 +0100
@@ -1218,15 +1208,10 @@
 #ifdef BAD_PAM
 	(void) seteuid(ruid); /* back to user's privileges */
 #endif
-
-	pam_error = pam_acct_mgmt(pamh, 0);
-	if (pam_error == PAM_NEW_AUTHTOK_REQD)
-		pam_error = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-	PAM_BAIL;
-
-	pam_error = pam_setcred(pamh, PAM_REINITIALIZE_CRED);
-	PAM_BAIL;
-
+	/* Do not do account management or credentials; credentials
+	 * are not needed and account management would just lock up
+	 * a computer and require root to come and unlock it.  Blech.
+	 */
 	pam_end(pamh, PAM_SUCCESS);
 	/* If this point is reached, the user has been authenticated. */
 	done = True;