diff options
| -rw-r--r-- | source4/lib/events/events_standard.c | 10 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 19 |
2 files changed, 26 insertions, 3 deletions
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index 8fe8d009bf..146dbc6b22 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -347,9 +347,17 @@ static void std_event_loop_timer(struct event_context *ev) /* deny the handler to free the event */ talloc_set_destructor(te, std_event_timed_deny_destructor); + + /* We need to remove the timer from the list before calling the + * handler because in a semi-async inner event loop called from the + * handler we don't want to come across this event again -- vl */ + DLIST_REMOVE(std_ev->timed_events, te); + te->handler(ev, te, t, te->private_data); - talloc_set_destructor(te, std_event_timed_destructor); + /* The destructor isn't necessary anymore, we've already removed the + * event from the list. */ + talloc_free(te); } diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 570a166532..5dbb63696a 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -257,6 +257,12 @@ 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 = @@ -271,13 +277,22 @@ static void wbsrv_samba3_check_machacc_receive_creds(struct composite_context *a NTSTATUS status; status = wb_get_schannel_creds_recv(action, service); - service->netlogon = state->getcreds->out.netlogon; talloc_unlink(state, state->conn->out.tree); /* The pipe owns it now */ state->conn->out.tree = NULL; - if (!NT_STATUS_IS_OK(status)) goto done; + 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 in 5 seconds.... :-) */ + event_add_timed(s3call->call->event_ctx, service, + timeval_current_ofs(5, 0), + delete_pipe, state->getcreds->out.netlogon); + service->netlogon = NULL; + goto done; + } + service->netlogon = state->getcreds->out.netlogon; s3call->response.result = WINBINDD_OK; done: if (!NT_STATUS_IS_OK(status)) { |