- markus@cvs.openbsd.org 2001/07/02 22:52:57

     [channels.c channels.h serverloop.c]
     improve cleanup/exit logic in ssh2:
     stop listening to channels, detach channel users (e.g. sessions).
     wait for children (i.e. dying sessions), send exit messages,
     cleanup all channels.

1 files changed, 4 insertions, 2 deletions

diff --git a/serverloop.c b/serverloop.c
index 773292a94..1db1c725a 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.73 2001/07/02 13:59:14 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.74 2001/07/02 22:52:57 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -711,7 +711,8 @@ server_loop2(Authctxt *authctxt)
          * there is a race between channel_free_all() killing children and
          * children dying before kill()
          */
-        channel_free_all();
+        channel_detach_all();
+        channel_stop_listening();
 
         while (session_have_children()) {
                 pid = waitpid(-1, &status, 0);
@@ -722,6 +723,7 @@ server_loop2(Authctxt *authctxt)
                         break;
                 }
         }
+        channel_free_all();
 }
 
 static void