Index: source/auth/auth_sam.c
===================================================================
--- source/auth/auth_sam.c	(revision 25393)
+++ source/auth/auth_sam.c	(working copy)
@@ -294,14 +294,16 @@
 	nt_status = sam_password_ok(auth_context, mem_ctx, sampass, 
 				    user_info, &user_sess_key, &lm_sess_key);
 
-	/* Notify passdb backend of login success/failure. If not NT_STATUS_OK the backend doesn't like the login */
+	/* Notify passdb backend of login success/failure. If not 
+	   NT_STATUS_OK the backend doesn't like the login */
+
 	update_login_attempts_status = pdb_update_login_attempts(sampass, NT_STATUS_IS_OK(nt_status));
-	if (!NT_STATUS_IS_OK(update_login_attempts_status))
-		nt_status = update_login_attempts_status;
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		if (NT_STATUS_EQUAL(nt_status,NT_STATUS_WRONG_PASSWORD) && 
-		    pdb_get_acct_ctrl(sampass) &ACB_NORMAL) {  
+		    pdb_get_acct_ctrl(sampass) &ACB_NORMAL &&
+		    NT_STATUS_IS_OK(update_login_attempts_status)) 
+		{  
 			pdb_increment_bad_password_count(sampass);
 			updated_badpw = True;
 		} else {
Index: source/passdb/pdb_interface.c
===================================================================
--- source/passdb/pdb_interface.c	(revision 25393)
+++ source/passdb/pdb_interface.c	(working copy)
@@ -1168,7 +1168,7 @@
 
 static NTSTATUS pdb_default_update_login_attempts (struct pdb_methods *methods, struct samu *newpwd, BOOL success)
 {
-	return NT_STATUS_OK;
+	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS pdb_default_setsampwent(struct pdb_methods *methods, BOOL update, uint32 acb_mask)