- (djm) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2001/10/10 22:18:47
     [channels.c channels.h clientloop.c nchan.c serverloop.c]
     [session.c session.h]
     try to keep channels open until an exit-status message is sent.
     don't kill the login shells if the shells stdin/out/err is closed.
     this should now work:
     ssh -2n localhost 'exec > /dev/null 2>&1; sleep 10; exit 5'; echo ?

1 files changed, 12 insertions, 3 deletions

diff --git a/nchan.c b/nchan.c
index 91c34dec8..2680f0a68 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.31 2001/07/17 21:04:57 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.32 2001/10/10 22:18:47 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -432,7 +432,7 @@ chan_mark_dead(Channel *c)
 }
 
 int
-chan_is_dead(Channel *c)
+chan_is_dead(Channel *c, int send)
 {
         if (c->type == SSH_CHANNEL_ZOMBIE) {
                 debug("channel %d: zombie", c->self);
@@ -461,7 +461,16 @@ chan_is_dead(Channel *c)
                        "read": "write");
         } else {
                 if (!(c->flags & CHAN_CLOSE_SENT)) {
-                        chan_send_close2(c);
+                        if (send) {
+                                chan_send_close2(c);
+                        } else {
+                                /* channel would be dead if we sent a close */
+                                if (c->flags & CHAN_CLOSE_RCVD) {
+                                        debug("channel %d: almost dead",
+                                            c->self);
+                                        return 1;
+                                }
+                        }
                 }
                 if ((c->flags & CHAN_CLOSE_SENT) &&
                     (c->flags & CHAN_CLOSE_RCVD)) {