diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-03-27 09:17:15 +1300 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2014-04-02 11:05:46 +0200 |
| commit | 4d50c751595511936c3d9a44ebb26a925c50a8bc (patch) | |
| tree | d4abcf2c0089bb6532d85e272108e1f829d51830 /source3/smbd | |
| parent | e1ec1f5d8df8511b2320cd25676896de170983d1 (diff) | |
| download | samba-4d50c751595511936c3d9a44ebb26a925c50a8bc.tar.gz samba-4d50c751595511936c3d9a44ebb26a925c50a8bc.tar.xz samba-4d50c751595511936c3d9a44ebb26a925c50a8bc.zip | |
s3-auth: Finally change make_user_info_*() use a parent talloc context
Change-Id: Iedf516e8c24e0d18064aeedd8e287ed692d3c5b4
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/sesssetup.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index f719ec52335..1a0cb5e29d5 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -100,14 +100,14 @@ static NTSTATUS check_guest_password(const struct tsocket_address *remote_addres auth_context->get_ntlm_challenge(auth_context, chal); - if (!make_user_info_guest(remote_address, &user_info)) { + if (!make_user_info_guest(talloc_tos(), remote_address, &user_info)) { TALLOC_FREE(auth_context); return NT_STATUS_NO_MEMORY; } nt_status = auth_check_password_session_info(auth_context, mem_ctx, user_info, session_info); - free_user_info(&user_info); + TALLOC_FREE(user_info); TALLOC_FREE(auth_context); return nt_status; } @@ -874,10 +874,11 @@ void reply_sesssetup_and_X(struct smb_request *req) END_PROFILE(SMBsesssetupX); return; } - nt_status = make_user_info_for_reply_enc(&user_info, user, - domain, - sconn->remote_address, - lm_resp, nt_resp); + nt_status = make_user_info_for_reply_enc(talloc_tos(), + &user_info, user, + domain, + sconn->remote_address, + lm_resp, nt_resp); if (NT_STATUS_IS_OK(nt_status)) { nt_status = auth_check_password_session_info(negprot_auth_context, req, user_info, &session_info); @@ -894,7 +895,8 @@ void reply_sesssetup_and_X(struct smb_request *req) plaintext_auth_context->get_ntlm_challenge( plaintext_auth_context, chal); - if (!make_user_info_for_reply(&user_info, + if (!make_user_info_for_reply(talloc_tos(), + &user_info, user, domain, sconn->remote_address, chal, @@ -910,7 +912,7 @@ void reply_sesssetup_and_X(struct smb_request *req) } } - free_user_info(&user_info); + TALLOC_FREE(user_info); if (!NT_STATUS_IS_OK(nt_status)) { data_blob_free(&nt_resp); |