The branch, master has been updated via e8ed54d s3:libsmb: remove unused TALLOC_FREE(subreq) calls in via 889886c s3:libsmb: call TALLOC_FREE(subreq) directly after cli_sesssetup_blob_recv() from eb24509 s3-messaging Do not ever send a kill to -1
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e8ed54d6c98ba4c0e8ac6b4cc7eb1df58e656d14 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Sep 20 05:00:46 2011 +0200 s3:libsmb: remove unused TALLOC_FREE(subreq) calls in Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Wed Sep 28 02:01:09 CEST 2011 on sn-devel-104 commit 889886c212935e16ebb763cb2afbc9b6f74f1acd Author: Stefan Metzmacher <me...@samba.org> Date: Tue Sep 20 04:57:45 2011 +0200 s3:libsmb: call TALLOC_FREE(subreq) directly after cli_sesssetup_blob_recv() cli_sesssetup_blob_recv() talloc moves stuff that's needed on the given memory context. metze ----------------------------------------------------------------------- Summary of changes: source3/libsmb/cliconnect.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index fbd25b1..92c9014 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1464,8 +1464,8 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq) NTSTATUS status; status = cli_sesssetup_blob_recv(subreq, talloc_tos(), NULL, &inbuf); + TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(subreq); tevent_req_nterror(req, status); return; } @@ -1475,11 +1475,10 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq) if (cli_simple_set_signing(state->cli, state->session_key_krb5, data_blob_null) && !cli_check_sign_mac(state->cli, inbuf, 1)) { - TALLOC_FREE(subreq); tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED); return; } - TALLOC_FREE(subreq); + tevent_req_done(req); } @@ -1638,7 +1637,6 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq) state->cli->server_domain = talloc_strdup(state->cli, state->ntlmssp_state->server.netbios_domain); if (state->cli->server_domain == NULL) { - TALLOC_FREE(subreq); tevent_req_nterror(req, NT_STATUS_NO_MEMORY); return; } @@ -1650,11 +1648,9 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq) state->cli, state->ntlmssp_state->session_key, data_blob_null) && !cli_check_sign_mac(state->cli, inbuf, 1)) { - TALLOC_FREE(subreq); tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED); return; } - TALLOC_FREE(subreq); TALLOC_FREE(state->ntlmssp_state); tevent_req_done(req); return; @@ -1697,14 +1693,12 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq) if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - TALLOC_FREE(subreq); TALLOC_FREE(state->ntlmssp_state); tevent_req_nterror(req, status); return; } state->blob_out = spnego_gen_auth(state, blob_out); - TALLOC_FREE(subreq); if (tevent_req_nomem(state->blob_out.data, req)) { return; } -- Samba Shared Repository