From 6d7ac4f1ad364cac6266bd3e88d141a7517a7d15 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 26 Jul 2011 17:20:35 +1000 Subject: s3-ntlmssp Add mem_ctx argument to auth_ntlmssp_update This clarifies the lifetime of the returned token. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/libsmb/ntlmssp_wrap.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source3/libsmb/ntlmssp_wrap.c') diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 43cde19b3b..454720423a 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -186,12 +186,19 @@ DATA_BLOB auth_ntlmssp_get_session_key(struct auth_ntlmssp_state *ans, TALLOC_CT } NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *ans, + TALLOC_CTX *mem_ctx, const DATA_BLOB request, DATA_BLOB *reply) { + NTSTATUS status; if (ans->gensec_security) { - return gensec_update(ans->gensec_security, ans, request, reply); + return gensec_update(ans->gensec_security, mem_ctx, request, reply); + } + status = ntlmssp_update(ans->ntlmssp_state, request, reply); + if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { + return status; } - return ntlmssp_update(ans->ntlmssp_state, request, reply); + talloc_steal(mem_ctx, reply->data); + return status; } NTSTATUS auth_ntlmssp_client_start(TALLOC_CTX *mem_ctx, -- cgit