4 files changed, 23 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a3b3b1a8..77d7739dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,12 @@
    - dtucker@cvs.openbsd.org 2008/06/15 16:58:40
      [servconf.c sshd_config.5]
      Allow MaxAuthTries within a Match block.  ok djm@
+   - djm@cvs.openbsd.org 2008/06/15 20:06:26
+     [channels.c channels.h session.c]
+     don't call isatty() on a pty master, instead pass a flag down to
+     channel_set_fds() indicating that te fds refer to a tty. Fixes a
+     hang on exit on Solaris (bz#1463) in portable but is actually
+     a generic bug; ok dtucker deraadt markus
 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
@@ -4393,4 +4399,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5018 2008/06/15 21:56:20 djm Exp $
+$Id: ChangeLog,v 1.5019 2008/06/15 21:59:23 djm Exp $
diff --git a/channels.c b/channels.c
index 04cd6b0a7..b1e544519 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.280 2008/06/12 15:19:17 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.281 2008/06/15 20:06:26 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -221,7 +221,7 @@ channel_lookup(int id)
  */
 static void
 channel_register_fds(Channel *c, int rfd, int wfd, int efd,
-    int extusage, int nonblock)
+    int extusage, int nonblock, int isatty)
 {
         /* Update the maximum file descriptor value. */
         channel_max_fd = MAX(channel_max_fd, rfd);
@@ -237,18 +237,9 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd,
         c->efd = efd;
         c->extended_usage = extusage;
 
-        /* XXX ugly hack: nonblock is only set by the server */
-        if (nonblock && isatty(c->rfd)) {
+        if ((c->isatty = isatty) != 0)
                 debug2("channel %d: rfd %d isatty", c->self, c->rfd);
-                c->isatty = 1;
-                if (!isatty(c->wfd)) {
-                        error("channel %d: wfd %d is not a tty?",
-                            c->self, c->wfd);
-                }
-        } else {
-                c->isatty = 0;
-        }
-        c->wfd_isatty = isatty(c->wfd);
+        c->wfd_isatty = isatty || isatty(c->wfd);
 
         /* enable nonblocking mode */
         if (nonblock) {
@@ -308,7 +299,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
         c->ostate = CHAN_OUTPUT_OPEN;
         c->istate = CHAN_INPUT_OPEN;
         c->flags = 0;
-        channel_register_fds(c, rfd, wfd, efd, extusage, nonblock);
+        channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, 0);
         c->self = found;
         c->type = type;
         c->ctype = ctype;
@@ -751,13 +742,13 @@ channel_register_filter(int id, channel_infilter_fn *ifn,
 
 void
 channel_set_fds(int id, int rfd, int wfd, int efd,
-    int extusage, int nonblock, u_int window_max)
+    int extusage, int nonblock, int isatty, u_int window_max)
 {
         Channel *c = channel_lookup(id);
 
         if (c == NULL || c->type != SSH_CHANNEL_LARVAL)
                 fatal("channel_activate for non-larval channel %d.", id);
-        channel_register_fds(c, rfd, wfd, efd, extusage, nonblock);
+        channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, isatty);
         c->type = SSH_CHANNEL_OPEN;
         c->local_window = c->local_window_max = window_max;
         packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);
diff --git a/channels.h b/channels.h
index ec8ea1c40..108b36068 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.95 2008/06/12 15:19:17 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.96 2008/06/15 20:06:26 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -188,7 +188,7 @@ struct Channel {
 Channel *channel_by_id(int);
 Channel *channel_lookup(int);
 Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int);
-void     channel_set_fds(int, int, int, int, int, int, u_int);
+void     channel_set_fds(int, int, int, int, int, int, int, u_int);
 void     channel_free(Channel *);
 void     channel_free_all(void);
 void     channel_stop_listening(void);
diff --git a/session.c b/session.c
index 3ea783f63..d692bc709 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.239 2008/06/14 18:33:43 djm Exp $ */
+/* $OpenBSD: session.c,v 1.240 2008/06/15 20:06:26 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -98,7 +98,7 @@
 /* func */
 
 Session *session_new(void);
-void    session_set_fds(Session *, int, int, int);
+void    session_set_fds(Session *, int, int, int, int);
 void    session_pty_cleanup(Session *);
 void    session_proctitle(Session *);
 int     session_setup_x11fwd(Session *);
@@ -591,7 +591,7 @@ do_exec_no_pty(Session *s, const char *command)
                         close(perr[0]);
                         perr[0] = -1;
                 }
-                session_set_fds(s, pin[1], pout[0], perr[0]);
+                session_set_fds(s, pin[1], pout[0], perr[0], 0);
         } else {
                 /* Enter the interactive session. */
                 server_loop(pid, pin[1], pout[0], perr[0]);
@@ -608,7 +608,7 @@ do_exec_no_pty(Session *s, const char *command)
          */
         if (compat20) {
                 session_set_fds(s, inout[1], inout[1],
-                    s->is_subsystem ? -1 : err[1]);
+                    s->is_subsystem ? -1 : err[1], 0);
                 if (s->is_subsystem)
                         close(err[1]);
         } else {
@@ -733,7 +733,7 @@ do_exec_pty(Session *s, const char *command)
         s->ptymaster = ptymaster;
         packet_set_interactive(1);
         if (compat20) {
-                session_set_fds(s, ptyfd, fdout, -1);
+                session_set_fds(s, ptyfd, fdout, -1, 1);
         } else {
                 server_loop(pid, ptyfd, fdout, -1);
                 /* server_loop _has_ closed ptyfd and fdout. */
@@ -2285,7 +2285,7 @@ session_input_channel_req(Channel *c, const char *rtype)
 }
 
 void
-session_set_fds(Session *s, int fdin, int fdout, int fderr)
+session_set_fds(Session *s, int fdin, int fdout, int fderr, int isatty)
 {
         if (!compat20)
                 fatal("session_set_fds: called for proto != 2.0");
@@ -2298,8 +2298,7 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr)
         channel_set_fds(s->chanid,
             fdout, fdin, fderr,
             fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
-            1,
-            CHAN_SES_WINDOW_DEFAULT);
+            1, isatty, CHAN_SES_WINDOW_DEFAULT);
 }
 
 /*