From: Matthias Dieter Wallnöfer Date: Thu, 22 Dec 2011 15:49:48 +0000 (+0100) Subject: s4:libcli/finddcs_nbt.c - free "req" consistently with "finddcs_cldap.c" X-Git-Tag: tevent-0.9.15~608 X-Git-Url: http://git.samba.org/?p=ddiss%2Fsamba.git;a=commitdiff_plain;h=2bc7b8f4c9992f5f825d8328e0353f793d7e7ebf s4:libcli/finddcs_nbt.c - free "req" consistently with "finddcs_cldap.c" It is more obvious to free where the context for the first time appears. Signed-off-by: Stefan Metzmacher --- diff --git a/source4/libcli/finddcs_nbt.c b/source4/libcli/finddcs_nbt.c index 9579a9e449f..6a5d1fd8563 100644 --- a/source4/libcli/finddcs_nbt.c +++ b/source4/libcli/finddcs_nbt.c @@ -284,7 +284,6 @@ NTSTATUS finddcs_nbt_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, *num_dcs = state->num_dcs; *dcs = talloc_steal(mem_ctx, state->dcs); } - talloc_free(req); return status; } @@ -298,6 +297,7 @@ NTSTATUS finddcs_nbt(TALLOC_CTX *mem_ctx, struct imessaging_context *msg_ctx, int *num_dcs, struct nbt_dc_name **dcs) { + NTSTATUS status; struct tevent_req *req = finddcs_nbt_send(mem_ctx, my_netbios_name, nbt_port, @@ -305,5 +305,7 @@ NTSTATUS finddcs_nbt(TALLOC_CTX *mem_ctx, domain_sid, resolve_ctx, event_ctx, msg_ctx); - return finddcs_nbt_recv(req, mem_ctx, num_dcs, dcs); + status = finddcs_nbt_recv(req, mem_ctx, num_dcs, dcs); + talloc_free(req); + return status; }