diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | serverloop.c | 12 |
2 files changed, 13 insertions, 5 deletions
@@ -40,6 +40,10 @@ - markus@cvs.openbsd.org 2001/10/09 19:32:49 [session.c] stat subsystem command before calling do_exec, and return error to client. + - markus@cvs.openbsd.org 2001/10/09 19:51:18 + [serverloop.c] + close all channels if the connection to the remote host has been closed, + should fix sshd's hanging with WCHAN==wait 20011007 - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. @@ -6685,4 +6689,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1596 2001/10/10 05:08:06 djm Exp $ +$Id: ChangeLog,v 1.1597 2001/10/10 05:08:36 djm Exp $ diff --git a/serverloop.c b/serverloop.c index 4577cc80..d7282fe2 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.79 2001/10/04 15:12:37 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.80 2001/10/09 19:51:18 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -699,6 +699,7 @@ server_loop2(Authctxt *authctxt) if (child_terminated) { while ((pid = waitpid(-1, &status, WNOHANG)) > 0) session_close_by_pid(pid, status); + /* XXX race */ child_terminated = 0; } if (!rekeying) @@ -708,6 +709,9 @@ server_loop2(Authctxt *authctxt) break; process_output(writeset); } + /* close all channels, no more reads and writes */ + channel_close_all(); + if (readset) xfree(readset); if (writeset) @@ -715,14 +719,14 @@ server_loop2(Authctxt *authctxt) mysignal(SIGCHLD, SIG_DFL); + /* collect dead children */ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) session_close_by_pid(pid, status); /* - * there is a race between channel_free_all() killing children and - * children dying before kill() + * there is a race between channel_detach_all() killing remaining + * children and children dying before kill() */ channel_detach_all(); - channel_stop_listening(); while (session_have_children()) { pid = waitpid(-1, &status, 0); |