diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-10-03 14:24:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:18 -0500 |
| commit | faf2ad667a8f973a6422c44fa7431c2fb6e4d82d (patch) | |
| tree | 3221dd33e654a8d60bdd94c8116ffc122fedf9c5 /source4/winbind | |
| parent | e5c6a3e36147103e87d1c55173f4b54ba6134904 (diff) | |
| download | samba-faf2ad667a8f973a6422c44fa7431c2fb6e4d82d.tar.gz samba-faf2ad667a8f973a6422c44fa7431c2fb6e4d82d.tar.bz2 samba-faf2ad667a8f973a6422c44fa7431c2fb6e4d82d.zip | |
r10684: Add a nasty hack for the failure case of wbinfo -t. Tridge has a proper fix
for it pending.
Also fix a bug with timed events: Don't call the same event recursively in the
handler's inner semi-async event loop.
Volker
(This used to be commit e38e50127a3414461578421e676a9c58c106c272)
Diffstat (limited to 'source4/winbind')
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 19 |
1 files changed, 17 insertions, 2 deletions
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)) { |