mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
r12014: free the irpc_request structure with the irpc_call_recv functions,
to match all other _recv functions we have metze
This commit is contained in:
parent
4d35c2b8e6
commit
bd4f85ab5f
@ -730,13 +730,18 @@ failed:
|
||||
*/
|
||||
NTSTATUS irpc_call_recv(struct irpc_request *irpc)
|
||||
{
|
||||
NTSTATUS status;
|
||||
|
||||
NT_STATUS_HAVE_NO_MEMORY(irpc);
|
||||
|
||||
while (!irpc->done) {
|
||||
if (event_loop_once(irpc->msg_ctx->event.ev) != 0) {
|
||||
return NT_STATUS_CONNECTION_DISCONNECTED;
|
||||
}
|
||||
}
|
||||
}
|
||||
return irpc->status;
|
||||
status = irpc->status;
|
||||
talloc_free(irpc);
|
||||
return status;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -750,9 +755,7 @@ NTSTATUS irpc_call(struct messaging_context *msg_ctx,
|
||||
{
|
||||
struct irpc_request *irpc = irpc_call_send(msg_ctx, server_id,
|
||||
table, callnum, r, mem_ctx);
|
||||
NTSTATUS status = irpc_call_recv(irpc);
|
||||
talloc_free(irpc);
|
||||
return status;
|
||||
return irpc_call_recv(irpc);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -248,7 +248,6 @@ static int ejs_irpc_call(int eid, struct MprVar *io,
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
goto done;
|
||||
}
|
||||
talloc_free(reqs[i]);
|
||||
|
||||
/* add to the results array */
|
||||
output = mprGetProperty(io, "output", NULL);
|
||||
|
@ -154,7 +154,6 @@ static void irpc_callback(struct irpc_request *irpc)
|
||||
r->in.in_data, *r->out.out_data, r->in.in_data+1);
|
||||
}
|
||||
(*pong_count)++;
|
||||
talloc_free(irpc);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -141,7 +141,6 @@ static void finddcs_getdc(struct irpc_request *ireq)
|
||||
talloc_get_type(ireq->async.private, struct finddcs_state);
|
||||
|
||||
state->ctx->status = irpc_call_recv(ireq);
|
||||
talloc_free(ireq);
|
||||
if (!composite_is_ok(state->ctx)) return;
|
||||
|
||||
state->dcs[0].name = talloc_steal(state->dcs, state->r.out.dcname);
|
||||
|
@ -132,7 +132,6 @@ static void get_dom_info_recv_dcname(struct irpc_request *ireq)
|
||||
|
||||
|
||||
state->ctx->status = irpc_call_recv(ireq);
|
||||
talloc_free(ireq);
|
||||
if (!composite_is_ok(state->ctx)) return;
|
||||
|
||||
state->info->dc_name = talloc_steal(state->info, state->r.out.dcname);
|
||||
|
Loading…
Reference in New Issue
Block a user