summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-04 10:08:45 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-04 10:08:45 +0000
commitb694d0ff5321e622b79d69fc6827ef7c96ebdb9e (patch)
tree50d8b8dbdb8474e8135c3b885e60c816f9ec976a /source3
parent1fb6f689e7d2534a5fe0a1232be7ea30be8f515e (diff)
downloadsamba-b694d0ff5321e622b79d69fc6827ef7c96ebdb9e.tar.gz
samba-b694d0ff5321e622b79d69fc6827ef7c96ebdb9e.tar.bz2
samba-b694d0ff5321e622b79d69fc6827ef7c96ebdb9e.zip
Merge HEAD: check both the account and password...
Andrew Bartlett (This used to be commit 830de56bf2f47412acfebf6c6353ab4b98c8517e)
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/auth_sam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 79fded870e..e2208e1455 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/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;