diff options
| author | Volker Lendecke <vl@samba.org> | 2008-11-30 12:54:32 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-11-30 17:15:19 +0100 |
| commit | 8fc15ab96d198dce6da2324bbd589a5e9e66740e (patch) | |
| tree | 174c898b2ef15f6ad97c77024cee5e395cbc48bc /source3/utils | |
| parent | d253a367ef04e4b00b9b87cbe61d2b19bf95a185 (diff) | |
| download | samba-8fc15ab96d198dce6da2324bbd589a5e9e66740e.tar.gz samba-8fc15ab96d198dce6da2324bbd589a5e9e66740e.tar.bz2 samba-8fc15ab96d198dce6da2324bbd589a5e9e66740e.zip | |
remove the explicit mem_ctx from ntlmssp_state, use the state itself
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/ntlm_auth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index fbb105bfe6..8aa8e5e0f9 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -547,7 +547,8 @@ static NTSTATUS winbind_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB if (memcmp(user_sess_key, zeros, 16) != 0) { *user_session_key = data_blob(user_sess_key, 16); } - ntlmssp_state->auth_context = talloc_strdup(ntlmssp_state->mem_ctx, unix_name); + ntlmssp_state->auth_context = talloc_strdup(ntlmssp_state, + unix_name); SAFE_FREE(unix_name); } else { DEBUG(NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED) ? 0 : 3, @@ -567,7 +568,7 @@ static NTSTATUS local_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *u nt_lm_owf_gen (opt_password, nt_pw, lm_pw); - nt_status = ntlm_password_check(ntlmssp_state->mem_ctx, + nt_status = ntlm_password_check(ntlmssp_state, &ntlmssp_state->chal, &ntlmssp_state->lm_resp, &ntlmssp_state->nt_resp, @@ -578,7 +579,7 @@ static NTSTATUS local_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *u lm_pw, nt_pw, user_session_key, lm_session_key); if (NT_STATUS_IS_OK(nt_status)) { - ntlmssp_state->auth_context = talloc_asprintf(ntlmssp_state->mem_ctx, + ntlmssp_state->auth_context = talloc_asprintf(ntlmssp_state, "%s%c%s", ntlmssp_state->domain, *lp_winbind_separator(), ntlmssp_state->user); |