diff options
| author | Volker Lendecke <vl@samba.org> | 2010-04-11 14:07:12 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-04-11 22:59:45 +0200 |
| commit | 19c00865537ff298e6306de4e81d376d3f068237 (patch) | |
| tree | 6fc697895c2e36af1d0735938b67f628915b71ae | |
| parent | 7ba21a339c591f546085fcd8cfbf77c25dcfe11e (diff) | |
| download | samba-19c00865537ff298e6306de4e81d376d3f068237.tar.gz samba-19c00865537ff298e6306de4e81d376d3f068237.tar.bz2 samba-19c00865537ff298e6306de4e81d376d3f068237.zip | |
s3: Replace "auth_context" by "challenge" in sam_password_ok args
| -rw-r--r-- | source3/auth/auth_sam.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index cf121d1dbf..366288ebe9 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -31,10 +31,10 @@ the lanman and NT responses. ****************************************************************************/ -static NTSTATUS sam_password_ok(const struct auth_context *auth_context, - TALLOC_CTX *mem_ctx, +static NTSTATUS sam_password_ok(TALLOC_CTX *mem_ctx, const char *username, uint32_t acct_ctrl, + const DATA_BLOB *challenge, const uint8_t *lm_pw, const uint8_t *nt_pw, const struct auth_usersupplied_info *user_info, @@ -93,7 +93,7 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context, return ntlm_password_check(mem_ctx, lp_lanman_auth(), lp_ntlm_auth(), user_info->logon_parameters, - &auth_context->challenge, + challenge, &user_info->lm_resp, &user_info->nt_resp, username, user_info->smb_name, @@ -336,8 +336,10 @@ static bool need_to_increment_bad_pw_count( continue; } - status = sam_password_ok(auth_context, mem_ctx, - username, acct_ctrl, NULL, nt_pw, + status = sam_password_ok(mem_ctx, + username, acct_ctrl, + &auth_context->challenge, + NULL, nt_pw, user_info, &user_sess_key, &lm_sess_key); if (NT_STATUS_IS_OK(status)) { result = false; @@ -411,8 +413,9 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, return NT_STATUS_ACCOUNT_LOCKED_OUT; } - nt_status = sam_password_ok(auth_context, mem_ctx, - username, pdb_get_acct_ctrl(sampass), lm_pw, nt_pw, + nt_status = sam_password_ok(mem_ctx, + username, pdb_get_acct_ctrl(sampass), + &auth_context->challenge, lm_pw, nt_pw, user_info, &user_sess_key, &lm_sess_key); /* Notify passdb backend of login success/failure. If not |