diff options
| author | Jeremy Allison <jra@samba.org> | 2007-06-12 19:53:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:17 -0500 |
| commit | 5aadea741fd541f43f2ca535ec40d6f82b5d37a3 (patch) | |
| tree | 2279b84fb0bc5baabd172e1e5b2951be792da0d3 /source3/nsswitch/winbindd_dual.c | |
| parent | a5f3e848c0db0e27d5e7ee43d730d69e4bed8106 (diff) | |
| download | samba-5aadea741fd541f43f2ca535ec40d6f82b5d37a3.tar.gz samba-5aadea741fd541f43f2ca535ec40d6f82b5d37a3.tar.bz2 samba-5aadea741fd541f43f2ca535ec40d6f82b5d37a3.zip | |
r23448: Doh ! Don't call winbind_child_died() *before* the
kill call as that sets pid = 0 ! :-).
Jeremy.
(This used to be commit bcfce39094ef30a1d1ae4dba5a90738e2678bcbf)
Diffstat (limited to 'source3/nsswitch/winbindd_dual.c')
| -rw-r--r-- | source3/nsswitch/winbindd_dual.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c index 1a9cabb2cc..2c2ef92046 100644 --- a/source3/nsswitch/winbindd_dual.c +++ b/source3/nsswitch/winbindd_dual.c @@ -178,19 +178,18 @@ static void async_request_timeout_handler(struct event_context *ctx, async_reply_recv(private_data, False); - /* - * Close the socket to the child. Should cause the - * child to exit. - */ - DEBUG(0,("async_request_timeout_handler: child pid %u is not responding. " "Closing connection to it.\n", state->child->pid )); - winbind_child_died(state->child->pid); - /* Send kill signal to child. */ kill(state->child->pid, SIGTERM); + + /* + * Close the socket to the child. + */ + + winbind_child_died(state->child->pid); } static void async_request_sent(void *private_data_data, BOOL success) |