diff options
| author | Gerald Carter <jerry@samba.org> | 2007-09-28 03:56:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:02 -0500 |
| commit | 99b031e190f68d976aa44bfb867f13e929a296f3 (patch) | |
| tree | d786014647774c1ba77d9f3d39a2530766e47c17 | |
| parent | 3529156971e17c7ec13f6a6243f7b613e4666cdd (diff) | |
| download | samba-99b031e190f68d976aa44bfb867f13e929a296f3.tar.gz samba-99b031e190f68d976aa44bfb867f13e929a296f3.tar.bz2 samba-99b031e190f68d976aa44bfb867f13e929a296f3.zip | |
r25401: BUG 4982: Don't delete lanman hashes on invalid logins when
using the "lanman auth = no". Tested by Guenter Kukkukk.
(This used to be commit 611fdd95a583ebd22ffa17e2f39c5a1bb0936c63)
| -rw-r--r-- | source3/auth/auth_sam.c | 10 | ||||
| -rw-r--r-- | source3/passdb/pdb_interface.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index eb02ad4e7d..9070de1ce4 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -294,14 +294,16 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, 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 { diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 16cd039572..f038522eed 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -1168,7 +1168,7 @@ static NTSTATUS pdb_default_rename_sam_account (struct pdb_methods *methods, str 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) |