From: Andrew Bartlett <abartlet@samba.org> 
Date: Tue, 4 Feb 2003 10:08:45 +0000 (+0000)
Subject: Merge HEAD: check both the account and password...
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=830de56bf2f47412acfebf6c6353ab4b98c8517e;hp=299233fbf2328d08546b3b03dceca67083b68493

Merge HEAD: check both the account and password...

Andrew Bartlett
---

diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 79fded870e9..e2208e14551 100644
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -420,13 +420,13 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
 
 	nt_status = sam_account_ok(mem_ctx, sampass, user_info);
 	
-	nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
-
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		pdb_free_sam(&sampass);
 		return nt_status;
 	}
 
+	nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		pdb_free_sam(&sampass);
 		return nt_status;