From 6bc8d37c20bf372a74d18621043588aee929008f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 4 Oct 2005 00:46:31 +0000 Subject: r10700: removed volkers temporary timer hack now that freeing the netlogon pipe is safe while inside a rpc callback (This used to be commit 5d752a519416c7a0c8c7d166f43eadc75cb5c37f) --- source4/winbind/wb_samba3_cmd.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'source4/winbind/wb_samba3_cmd.c') diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 751c48f8fd..d0c38d607e 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -256,12 +256,6 @@ static void wbsrv_samba3_check_machacc_receive_tree(struct composite_context *ac } } -static void delete_pipe(struct event_context *ctx, struct timed_event *te, - struct timeval tv, void *p) -{ - talloc_free(p); -} - static void wbsrv_samba3_check_machacc_receive_creds(struct composite_context *action) { struct wbsrv_samba3_call *s3call = @@ -281,12 +275,7 @@ static void wbsrv_samba3_check_machacc_receive_creds(struct composite_context *a state->conn->out.tree = NULL; if (!NT_STATUS_IS_OK(status)) { - /* Nasty hack awaiting a proper fix. So far we can not - * delete a pipe from an async rpc callback which where we are - * in right now, so delete the pipe from an event handler.. */ - event_add_timed(s3call->call->event_ctx, service, - timeval_zero(), - delete_pipe, state->getcreds->out.netlogon); + talloc_free(service->netlogon); service->netlogon = NULL; goto done; } -- cgit