* New upstream release (LP: #535029).

  - After a transition period of about 10 years, this release disables SSH
    protocol 1 by default.  Clients and servers that need to use the
    legacy protocol must explicitly enable it in ssh_config / sshd_config
    or on the command-line.
  - Remove the libsectok/OpenSC-based smartcard code and add support for
    PKCS#11 tokens.  This support is enabled by default in the Debian
    packaging, since it now doesn't involve additional library
    dependencies (closes: #231472, LP: #16918).
  - Add support for certificate authentication of users and hosts using a
    new, minimal OpenSSH certificate format (closes: #482806).
  - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
  - Add the ability to revoke keys in sshd(8) and ssh(1).  (For the Debian
    package, this overlaps with the key blacklisting facility added in
    openssh 1:4.7p1-9, but with different file formats and slightly
    different scopes; for the moment, I've roughly merged the two.)
  - Various multiplexing improvements, including support for requesting
    port-forwardings via the multiplex protocol (closes: #360151).
  - Allow setting an explicit umask on the sftp-server(8) commandline to
    override whatever default the user has (closes: #496843).
  - Many sftp client improvements, including tab-completion, more options,
    and recursive transfer support for get/put (LP: #33378).  The old
    mget/mput commands never worked properly and have been removed
    (closes: #270399, #428082).
  - Do not prompt for a passphrase if we fail to open a keyfile, and log
    the reason why the open failed to debug (closes: #431538).
  - Prevent sftp from crashing when given a "-" without a command.  Also,
    allow whitespace to follow a "-" (closes: #531561).

1 files changed, 40 insertions, 35 deletions

diff --git a/clientloop.c b/clientloop.c
index cea0d617a..a55fe9995 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */
+/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -125,7 +125,7 @@ extern int stdin_null_flag;
 extern int no_shell_flag;
 
 /* Control socket */
-extern int muxserver_sock;
+extern int muxserver_sock; /* XXX use mux_client_cleanup() instead */
 
 /*
  * Name of the host we are connecting to.  This is the name given on the
@@ -134,6 +134,9 @@ extern int muxserver_sock;
  */
 extern char *host;
 
+/* Force TTY allocation */
+extern int force_tty_flag;
+
 /*
  * Flag to indicate that we have received a window change signal which has
  * not yet been processed.  This will cause a message indicating the new
@@ -147,7 +150,7 @@ static volatile sig_atomic_t received_signal = 0;
 static int in_non_blocking_mode = 0;
 
 /* Common data for the client loop code. */
-static volatile sig_atomic_t quit_pending; /* Set non-zero to quit the loop. */
+volatile sig_atomic_t quit_pending; /* Set non-zero to quit the loop. */
 static int escape_char1;        /* Escape character. (proto1 only) */
 static int escape_pending1;     /* Last character was an escape (proto1 only) */
 static int last_was_cr;         /* Last character was a newline. */
@@ -165,6 +168,8 @@ static int session_closed = 0;	/* In SSH2: login session closed. */
 static void client_init_dispatch(void);
 int     session_ident = -1;
 
+int     session_resumed = 0;
+
 /* Track escape per proto2 channel */
 struct escape_filter_ctx {
         int escape_pending;
@@ -568,9 +573,6 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
         if (packet_have_data_to_write())
                 FD_SET(connection_out, *writesetp);
 
-        if (muxserver_sock != -1)
-                FD_SET(muxserver_sock, *readsetp);
-
         /*
          * Wait for something to happen.  This will suspend the process until
          * some selected descriptor can be read, written, or has some other
@@ -617,7 +619,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
                 atomicio(vwrite, fileno(stderr), buffer_ptr(berr),
                     buffer_len(berr));
 
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
 
         /*
          * Free (and clear) the buffer to reduce the amount of data that gets
@@ -638,7 +640,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
         buffer_init(bout);
         buffer_init(berr);
 
-        enter_raw_mode();
+        enter_raw_mode(force_tty_flag);
 }
 
 static void
@@ -699,7 +701,7 @@ client_status_confirm(int type, Channel *c, void *ctx)
 
         /* XXX supress on mux _client_ quietmode */
         tochan = options.log_level >= SYSLOG_LEVEL_ERROR &&
-            c->ctl_fd != -1 && c->extended_usage == CHAN_EXTENDED_WRITE;
+            c->ctl_chan != -1 && c->extended_usage == CHAN_EXTENDED_WRITE;
 
         if (type == SSH2_MSG_CHANNEL_SUCCESS) {
                 debug2("%s request accepted on channel %d",
@@ -781,7 +783,7 @@ process_cmdline(void)
         bzero(&fwd, sizeof(fwd));
         fwd.listen_host = fwd.connect_host = NULL;
 
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
         handler = signal(SIGINT, SIG_IGN);
         cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
         if (s == NULL)
@@ -843,6 +845,7 @@ process_cmdline(void)
         while (isspace(*++s))
                 ;
 
+        /* XXX update list of forwards in options */
         if (delete) {
                 cancel_port = 0;
                 cancel_host = hpdelim(&s);      /* may be NULL */
@@ -884,7 +887,7 @@ process_cmdline(void)
 
 out:
         signal(SIGINT, handler);
-        enter_raw_mode();
+        enter_raw_mode(force_tty_flag);
         if (cmd)
                 xfree(cmd);
         if (fwd.listen_host != NULL)
@@ -940,7 +943,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                     escape_char);
                                 buffer_append(berr, string, strlen(string));
 
-                                if (c && c->ctl_fd != -1) {
+                                if (c && c->ctl_chan != -1) {
                                         chan_read_failed(c);
                                         chan_write_failed(c);
                                         return 0;
@@ -950,7 +953,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
 
                         case 'Z' - 64:
                                 /* XXX support this for mux clients */
-                                if (c && c->ctl_fd != -1) {
+                                if (c && c->ctl_chan != -1) {
  noescape:
                                         snprintf(string, sizeof string,
                                             "%c%c escape not available to "
@@ -995,7 +998,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                 continue;
 
                         case '&':
-                                if (c && c->ctl_fd != -1)
+                                if (c && c->ctl_chan != -1)
                                         goto noescape;
                                 /*
                                  * Detach the program (continue to serve
@@ -1003,7 +1006,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                  * more new connections).
                                  */
                                 /* Restore tty modes. */
-                                leave_raw_mode();
+                                leave_raw_mode(force_tty_flag);
 
                                 /* Stop listening for new connections. */
                                 channel_stop_listening();
@@ -1046,7 +1049,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                 continue;
 
                         case '?':
-                                if (c && c->ctl_fd != -1) {
+                                if (c && c->ctl_chan != -1) {
                                         snprintf(string, sizeof string,
 "%c?\r\n\
 Supported escape sequences:\r\n\
@@ -1095,7 +1098,7 @@ Supported escape sequences:\r\n\
                                 continue;
 
                         case 'C':
-                                if (c && c->ctl_fd != -1)
+                                if (c && c->ctl_chan != -1)
                                         goto noescape;
                                 process_cmdline();
                                 continue;
@@ -1298,7 +1301,7 @@ client_channel_closed(int id, void *arg)
 {
         channel_cancel_cleanup(id);
         session_closed = 1;
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
 }
 
 /*
@@ -1331,8 +1334,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         connection_in = packet_get_connection_in();
         connection_out = packet_get_connection_out();
         max_fd = MAX(connection_in, connection_out);
-        if (muxserver_sock != -1)
-                max_fd = MAX(max_fd, muxserver_sock);
 
         if (!compat20) {
                 /* enable nonblocking unless tty */
@@ -1371,7 +1372,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         signal(SIGWINCH, window_change_handler);
 
         if (have_pty)
-                enter_raw_mode();
+                enter_raw_mode(force_tty_flag);
 
         if (compat20) {
                 session_ident = ssh2_chan_id;
@@ -1459,12 +1460,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                 /* Buffer input from the connection.  */
                 client_process_net_input(readset);
 
-                /* Accept control connections.  */
-                if (muxserver_sock != -1 &&FD_ISSET(muxserver_sock, readset)) {
-                        if (muxserver_accept_control())
-                                quit_pending = 1;
-                }
-
                 if (quit_pending)
                         break;
 
@@ -1478,6 +1473,14 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                         client_process_output(writeset);
                 }
 
+                if (session_resumed) {
+                        connection_in = packet_get_connection_in();
+                        connection_out = packet_get_connection_out();
+                        max_fd = MAX(max_fd, connection_out);
+                        max_fd = MAX(max_fd, connection_in);
+                        session_resumed = 0;
+                }
+
                 /*
                  * Send as much buffered packet data as possible to the
                  * sender.
@@ -1506,7 +1509,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         channel_free_all();
 
         if (have_pty)
-                leave_raw_mode();
+                leave_raw_mode(force_tty_flag);
 
         /* restore blocking io */
         if (!isatty(fileno(stdin)))
@@ -1866,15 +1869,17 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
                 chan_rcvd_eow(c);
         } else if (strcmp(rtype, "exit-status") == 0) {
                 exitval = packet_get_int();
-                if (id == session_ident) {
+                if (c->ctl_chan != -1) {
+                        mux_exit_message(c, exitval);
+                        success = 1;
+                } else if (id == session_ident) {
+                        /* Record exit value of local session */
                         success = 1;
                         exit_status = exitval;
-                } else if (c->ctl_fd == -1) {
-                        error("client_input_channel_req: unexpected channel %d",
-                            session_ident);
                 } else {
-                        atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval));
-                        success = 1;
+                        /* Probably for a mux channel that has already closed */
+                        debug("%s: no sink for exit-status on channel %d",
+                            __func__, id);
                 }
                 packet_check_eom();
         }
@@ -2070,7 +2075,7 @@ client_init_dispatch(void)
 void
 cleanup_exit(int i)
 {
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
         leave_non_blocking();
         if (options.control_path != NULL && muxserver_sock != -1)
                 unlink(options.control_path);