* New upstream release (closes: #474301). Important changes not previously

  backported to 4.7p1:
  - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
    + Added chroot(2) support for sshd(8), controlled by a new option
      "ChrootDirectory" (closes: #139047, LP: #24777).
    + Linked sftp-server(8) into sshd(8). The internal sftp server is used
      when the command "internal-sftp" is specified in a Subsystem or
      ForceCommand declaration. When used with ChrootDirectory, the
      internal sftp server requires no special configuration of files
      inside the chroot environment.
    + Added a protocol extension method "posix-rename@openssh.com" for
      sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
      prefers this if available (closes: #308561).
    + Removed the fixed limit of 100 file handles in sftp-server(8).
    + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
      keys when in inetd mode and protocol 2 connections are negotiated.
      This speeds up protocol 2 connections to inetd-mode servers that
      also allow Protocol 1.
    + Accept the PermitRootLogin directive in a sshd_config(5) Match
      block. Allows for, e.g. permitting root only from the local network.
    + Reworked sftp(1) argument splitting and escaping to be more
      internally consistent (i.e. between sftp commands) and more
      consistent with sh(1). Please note that this will change the
      interpretation of some quoted strings, especially those with
      embedded backslash escape sequences.
    + Support "Banner=none" in sshd_config(5) to disable sending of a
      pre-login banner (e.g. in a Match block).
    + ssh(1) ProxyCommands are now executed with $SHELL rather than
      /bin/sh.
    + ssh(1)'s ConnectTimeout option is now applied to both the TCP
      connection and the SSH banner exchange (previously it just covered
      the TCP connection). This allows callers of ssh(1) to better detect
      and deal with stuck servers that accept a TCP connection but don't
      progress the protocol, and also makes ConnectTimeout useful for
      connections via a ProxyCommand.
    + scp(1) incorrectly reported "stalled" on slow copies (closes:
      #140828).
    + scp(1) date underflow for timestamps before epoch.
    + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
      instead of the current standard RRSIG.
    + Correctly drain ACKs when a sftp(1) upload write fails midway,
      avoids a fatal() exit from what should be a recoverable condition.
    + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
      hostname") to not include any IP address in the data to be hashed.
    + Make ssh(1) skip listening on the IPv6 wildcard address when a
      binding address of 0.0.0.0 is used against an old SSH server that
      does not support the RFC4254 syntax for wildcard bind addresses.
    + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
      already done for X11/TCP forwarding sockets (closes: #439661).
    + Fix FD leak that could hang a ssh(1) connection multiplexing master.
    + Make ssh(1) -q option documentation consistent with reality.
    + Fixed sshd(8) PAM support not calling pam_session_close(), or
      failing to call it with root privileges (closes: #372680).
    + Fix activation of OpenSSL engine support when requested in configure
      (LP: #119295).
  - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
    + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
      and ssh-keygen(1). Visual fingerprint display is controlled by a new
      ssh_config(5) option "VisualHostKey". The intent is to render SSH
      host keys in a visual form that is amenable to easy recall and
      rejection of changed host keys.
    + sshd_config(5) now supports CIDR address/masklen matching in "Match
      address" blocks, with a fallback to classic wildcard matching.
    + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
      from="..." restrictions, also with a fallback to classic wildcard
      matching.
    + Added an extended test mode (-T) to sshd(8) to request that it write
      its effective configuration to stdout and exit. Extended test mode
      also supports the specification of connection parameters (username,
      source address and hostname) to test the application of
      sshd_config(5) Match rules.
    + ssh(1) now prints the number of bytes transferred and the overall
      connection throughput for SSH protocol 2 sessions when in verbose
      mode (previously these statistics were displayed for protocol 1
      connections only).
    + sftp-server(8) now supports extension methods statvfs@openssh.com
      and fstatvfs@openssh.com that implement statvfs(2)-like operations.
    + sftp(1) now has a "df" command to the sftp client that uses the
      statvfs@openssh.com to produce a df(1)-like display of filesystem
      space and inode utilisation (requires statvfs@openssh.com support on
      the server).
    + Added a MaxSessions option to sshd_config(5) to allow control of the
      number of multiplexed sessions supported over a single TCP
      connection. This allows increasing the number of allowed sessions
      above the previous default of 10, disabling connection multiplexing
      (MaxSessions=1) or disallowing login/shell/subsystem sessions
      entirely (MaxSessions=0).
    + Added a no-more-sessions@openssh.com global request extension that
      is sent from ssh(1) to sshd(8) when the client knows that it will
      never request another session (i.e. when session multiplexing is
      disabled). This allows a server to disallow further session requests
      and terminate the session in cases where the client has been
      hijacked.
    + ssh-keygen(1) now supports the use of the -l option in combination
      with -F to search for a host in ~/.ssh/known_hosts and display its
      fingerprint.
    + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
      "rsa1".
    + Added an AllowAgentForwarding option to sshd_config(8) to control
      whether authentication agent forwarding is permitted. Note that this
      is a loose control, as a client may install their own unofficial
      forwarder.
    + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
      receiving network data, resulting in a ~10% speedup.
    + ssh(1) and sshd(8) will now try additional addresses when connecting
      to a port forward destination whose DNS name resolves to more than
      one address. The previous behaviour was to try the only first
      address and give up if that failed.
    + ssh(1) and sshd(8) now support signalling that channels are
      half-closed for writing, through a channel protocol extension
      notification "eow@openssh.com". This allows propagation of closed
      file descriptors, so that commands such as "ssh -2 localhost od
      /bin/ls | true" do not send unnecessary data over the wire.
    + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
      from 768 to 1024 bits.
    + When ssh(1) has been requested to fork after authentication ("ssh
      -f") with ExitOnForwardFailure enabled, delay the fork until after
      replies for any -R forwards have been seen. Allows for robust
      detection of -R forward failure when using -f.
    + "Match group" blocks in sshd_config(5) now support negation of
      groups. E.g. "Match group staff,!guests".
    + sftp(1) and sftp-server(8) now allow chmod-like operations to set
      set[ug]id/sticky bits.
    + The MaxAuthTries option is now permitted in sshd_config(5) match
      blocks.
    + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
      that are available to a primary connection.
    + ssh(1) connection multiplexing will now fall back to creating a new
      connection in most error cases (closes: #352830).
    + Make ssh(1) deal more gracefully with channel requests that fail.
      Previously it would optimistically assume that requests would always
      succeed, which could cause hangs if they did not (e.g. when the
      server runs out of file descriptors).
    + ssh(1) now reports multiplexing errors via the multiplex slave's
      stderr where possible (subject to LogLevel in the mux master).
    + Prevent sshd(8) from erroneously applying public key restrictions
      leaned from ~/.ssh/authorized_keys to other authentication methods
      when public key authentication subsequently fails (LP: #161047).
    + Fixed an UMAC alignment problem that manifested on Itanium
      platforms.

1 files changed, 229 insertions, 115 deletions

diff --git a/channels.c b/channels.c
index 900ab848f..c293eadf1 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.270 2007/06/25 08:20:03 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.286 2008/07/16 11:52:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -61,6 +61,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 
+#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh1.h"
@@ -164,6 +165,10 @@ static int IPv4or6 = AF_UNSPEC;
 /* helper */
 static void port_open_helper(Channel *c, char *rtype);
 
+/* non-blocking connect helpers */
+static int connect_next(struct channel_connect *);
+static void channel_connect_ctx_free(struct channel_connect *);
+
 /* -- channel core */
 
 Channel *
@@ -216,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 is_tty)
 {
         /* Update the maximum file descriptor value. */
         channel_max_fd = MAX(channel_max_fd, rfd);
@@ -232,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 = is_tty) != 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 = is_tty || isatty(c->wfd);
 
         /* enable nonblocking mode */
         if (nonblock) {
@@ -303,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;
@@ -319,10 +315,13 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
         c->single_connection = 0;
         c->detach_user = NULL;
         c->detach_close = 0;
-        c->confirm = NULL;
-        c->confirm_ctx = NULL;
+        c->open_confirm = NULL;
+        c->open_confirm_ctx = NULL;
         c->input_filter = NULL;
         c->output_filter = NULL;
+        c->filter_ctx = NULL;
+        c->filter_cleanup = NULL;
+        TAILQ_INIT(&c->status_confirms);
         debug("channel %d: new [%s]", found, remote_name);
         return c;
 }
@@ -379,6 +378,7 @@ channel_free(Channel *c)
 {
         char *s;
         u_int i, n;
+        struct channel_confirm *cc;
 
         for (n = 0, i = 0; i < channels_alloc; i++)
                 if (channels[i])
@@ -402,6 +402,15 @@ channel_free(Channel *c)
                 xfree(c->remote_name);
                 c->remote_name = NULL;
         }
+        while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) {
+                if (cc->abandon_cb != NULL)
+                        cc->abandon_cb(c, cc->ctx);
+                TAILQ_REMOVE(&c->status_confirms, cc, entry);
+                bzero(cc, sizeof(*cc));
+                xfree(cc);
+        }
+        if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
+                c->filter_cleanup(c->self, c->filter_ctx);
         channels[c->self] = NULL;
         xfree(c);
 }
@@ -660,16 +669,33 @@ channel_request_start(int id, char *service, int wantconfirm)
 }
 
 void
-channel_register_confirm(int id, channel_callback_fn *fn, void *ctx)
+channel_register_status_confirm(int id, channel_confirm_cb *cb,
+    channel_confirm_abandon_cb *abandon_cb, void *ctx)
+{
+        struct channel_confirm *cc;
+        Channel *c;
+
+        if ((c = channel_lookup(id)) == NULL)
+                fatal("channel_register_expect: %d: bad id", id);
+
+        cc = xmalloc(sizeof(*cc));
+        cc->cb = cb;
+        cc->abandon_cb = abandon_cb;
+        cc->ctx = ctx;
+        TAILQ_INSERT_TAIL(&c->status_confirms, cc, entry);
+}
+
+void
+channel_register_open_confirm(int id, channel_callback_fn *fn, void *ctx)
 {
         Channel *c = channel_lookup(id);
 
         if (c == NULL) {
-                logit("channel_register_comfirm: %d: bad id", id);
+                logit("channel_register_open_comfirm: %d: bad id", id);
                 return;
         }
-        c->confirm = fn;
-        c->confirm_ctx = ctx;
+        c->open_confirm = fn;
+        c->open_confirm_ctx = ctx;
 }
 
 void
@@ -700,7 +726,7 @@ channel_cancel_cleanup(int id)
 
 void
 channel_register_filter(int id, channel_infilter_fn *ifn,
-    channel_outfilter_fn *ofn)
+    channel_outfilter_fn *ofn, channel_filter_cleanup_fn *cfn, void *ctx)
 {
         Channel *c = channel_lookup(id);
 
@@ -710,17 +736,19 @@ channel_register_filter(int id, channel_infilter_fn *ifn,
         }
         c->input_filter = ifn;
         c->output_filter = ofn;
+        c->filter_ctx = ctx;
+        c->filter_cleanup = cfn;
 }
 
 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 is_tty, 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, is_tty);
         c->type = SSH_CHANNEL_OPEN;
         c->local_window = c->local_window_max = window_max;
         packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);
@@ -788,7 +816,8 @@ channel_pre_open(Channel *c, fd_set *readset, fd_set *writeset)
                 }
         }
         /** XXX check close conditions, too */
-        if (compat20 && c->efd != -1) {
+        if (compat20 && c->efd != -1 && 
+            !(c->istate == CHAN_INPUT_CLOSED && c->ostate == CHAN_OUTPUT_CLOSED)) {
                 if (c->extended_usage == CHAN_EXTENDED_WRITE &&
                     buffer_len(&c->extended) > 0)
                         FD_SET(c->efd, writeset);
@@ -1181,7 +1210,7 @@ static void
 channel_post_x11_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {
         Channel *nc;
-        struct sockaddr addr;
+        struct sockaddr_storage addr;
         int newsock;
         socklen_t addrlen;
         char buf[16384], *remote_ipaddr;
@@ -1190,7 +1219,7 @@ channel_post_x11_listener(Channel *c, fd_set *readset, fd_set *writeset)
         if (FD_ISSET(c->sock, readset)) {
                 debug("X11 connection requested.");
                 addrlen = sizeof(addr);
-                newsock = accept(c->sock, &addr, &addrlen);
+                newsock = accept(c->sock, (struct sockaddr *)&addr, &addrlen);
                 if (c->single_connection) {
                         debug2("single_connection: closing X11 listener.");
                         channel_close_fd(&c->sock);
@@ -1307,7 +1336,7 @@ static void
 channel_post_port_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {
         Channel *nc;
-        struct sockaddr addr;
+        struct sockaddr_storage addr;
         int newsock, nextstate;
         socklen_t addrlen;
         char *rtype;
@@ -1331,7 +1360,7 @@ channel_post_port_listener(Channel *c, fd_set *readset, fd_set *writeset)
                 }
 
                 addrlen = sizeof(addr);
-                newsock = accept(c->sock, &addr, &addrlen);
+                newsock = accept(c->sock, (struct sockaddr *)&addr, &addrlen);
                 if (newsock < 0) {
                         error("accept: %.100s", strerror(errno));
                         return;
@@ -1366,12 +1395,12 @@ channel_post_auth_listener(Channel *c, fd_set *readset, fd_set *writeset)
 {
         Channel *nc;
         int newsock;
-        struct sockaddr addr;
+        struct sockaddr_storage addr;
         socklen_t addrlen;
 
         if (FD_ISSET(c->sock, readset)) {
                 addrlen = sizeof(addr);
-                newsock = accept(c->sock, &addr, &addrlen);
+                newsock = accept(c->sock, (struct sockaddr *)&addr, &addrlen);
                 if (newsock < 0) {
                         error("accept from auth socket: %.100s", strerror(errno));
                         return;
@@ -1398,7 +1427,7 @@ channel_post_auth_listener(Channel *c, fd_set *readset, fd_set *writeset)
 static void
 channel_post_connecting(Channel *c, fd_set *readset, fd_set *writeset)
 {
-        int err = 0;
+        int err = 0, sock;
         socklen_t sz = sizeof(err);
 
         if (FD_ISSET(c->sock, writeset)) {
@@ -1407,7 +1436,9 @@ channel_post_connecting(Channel *c, fd_set *readset, fd_set *writeset)
                         error("getsockopt SO_ERROR failed");
                 }
                 if (err == 0) {
-                        debug("channel %d: connected", c->self);
+                        debug("channel %d: connected to %s port %d",
+                            c->self, c->connect_ctx.host, c->connect_ctx.port);
+                        channel_connect_ctx_free(&c->connect_ctx);
                         c->type = SSH_CHANNEL_OPEN;
                         if (compat20) {
                                 packet_start(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION);
@@ -1421,8 +1452,19 @@ channel_post_connecting(Channel *c, fd_set *readset, fd_set *writeset)
                                 packet_put_int(c->self);
                         }
                 } else {
-                        debug("channel %d: not connected: %s",
+                        debug("channel %d: connection failed: %s",
                             c->self, strerror(err));
+                        /* Try next address, if any */
+                        if ((sock = connect_next(&c->connect_ctx)) > 0) {
+                                close(c->sock);
+                                c->sock = c->rfd = c->wfd = sock;
+                                channel_max_fd = channel_find_maxfd();
+                                return;
+                        }
+                        /* Exhausted all addresses */
+                        error("connect_to %.100s port %d: failed.",
+                            c->connect_ctx.host, c->connect_ctx.port);
+                        channel_connect_ctx_free(&c->connect_ctx);
                         if (compat20) {
                                 packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE);
                                 packet_put_int(c->remote_id);
@@ -1452,7 +1494,8 @@ channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
         if (c->rfd != -1 && (force || FD_ISSET(c->rfd, readset))) {
                 errno = 0;
                 len = read(c->rfd, buf, sizeof(buf));
-                if (len < 0 && (errno == EINTR || (errno == EAGAIN && !force)))
+                if (len < 0 && (errno == EINTR ||
+                    ((errno == EAGAIN || errno == EWOULDBLOCK) && !force)))
                         return 1;
 #ifndef PTY_ZEROREAD
                 if (len <= 0) {
@@ -1523,7 +1566,8 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)
                         c->local_consumed += dlen + 4;
                         len = write(c->wfd, buf, dlen);
                         xfree(data);
-                        if (len < 0 && (errno == EINTR || errno == EAGAIN))
+                        if (len < 0 && (errno == EINTR || errno == EAGAIN ||
+                            errno == EWOULDBLOCK))
                                 return 1;
                         if (len <= 0) {
                                 if (c->type != SSH_CHANNEL_OPEN)
@@ -1541,7 +1585,8 @@ channel_handle_wfd(Channel *c, fd_set *readset, fd_set *writeset)
 #endif
 
                 len = write(c->wfd, buf, dlen);
-                if (len < 0 && (errno == EINTR || errno == EAGAIN))
+                if (len < 0 &&
+                    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
                         return 1;
                 if (len <= 0) {
                         if (c->type != SSH_CHANNEL_OPEN) {
@@ -1593,7 +1638,8 @@ channel_handle_efd(Channel *c, fd_set *readset, fd_set *writeset)
                             buffer_len(&c->extended));
                         debug2("channel %d: written %d to efd %d",
                             c->self, len, c->efd);
-                        if (len < 0 && (errno == EINTR || errno == EAGAIN))
+                        if (len < 0 && (errno == EINTR || errno == EAGAIN ||
+                            errno == EWOULDBLOCK))
                                 return 1;
                         if (len <= 0) {
                                 debug2("channel %d: closing write-efd %d",
@@ -1608,8 +1654,8 @@ channel_handle_efd(Channel *c, fd_set *readset, fd_set *writeset)
                         len = read(c->efd, buf, sizeof(buf));
                         debug2("channel %d: read %d from efd %d",
                             c->self, len, c->efd);
-                        if (len < 0 && (errno == EINTR ||
-                            (errno == EAGAIN && !c->detach_close)))
+                        if (len < 0 && (errno == EINTR || ((errno == EAGAIN ||
+                            errno == EWOULDBLOCK) && !c->detach_close)))
                                 return 1;
                         if (len <= 0) {
                                 debug2("channel %d: closing read-efd %d",
@@ -1633,7 +1679,8 @@ channel_handle_ctl(Channel *c, fd_set *readset, fd_set *writeset)
         /* Monitor control fd to detect if the slave client exits */
         if (c->ctl_fd != -1 && FD_ISSET(c->ctl_fd, readset)) {
                 len = read(c->ctl_fd, buf, sizeof(buf));
-                if (len < 0 && (errno == EINTR || errno == EAGAIN))
+                if (len < 0 &&
+                    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
                         return 1;
                 if (len <= 0) {
                         debug2("channel %d: ctl read<=0", c->self);
@@ -2012,7 +2059,7 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
                 return;
 
         /* Get the data. */
-        data = packet_get_string(&data_len);
+        data = packet_get_string_ptr(&data_len);
 
         /*
          * Ignore data for protocol > 1.3 if output end is no longer open.
@@ -2026,7 +2073,6 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
                         c->local_window -= data_len;
                         c->local_consumed += data_len;
                 }
-                xfree(data);
                 return;
         }
 
@@ -2038,17 +2084,15 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
                 if (data_len > c->local_window) {
                         logit("channel %d: rcvd too much data %d, win %d",
                             c->self, data_len, c->local_window);
-                        xfree(data);
                         return;
                 }
                 c->local_window -= data_len;
         }
-        packet_check_eom();
         if (c->datagram)
                 buffer_put_string(&c->output, data, data_len);
         else
                 buffer_append(&c->output, data, data_len);
-        xfree(data);
+        packet_check_eom();
 }
 
 /* ARGSUSED */
@@ -2212,9 +2256,9 @@ channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt)
         if (compat20) {
                 c->remote_window = packet_get_int();
                 c->remote_maxpacket = packet_get_int();
-                if (c->confirm) {
+                if (c->open_confirm) {
                         debug2("callback start");
-                        c->confirm(c->self, c->confirm_ctx);
+                        c->open_confirm(c->self, c->open_confirm_ctx);
                         debug2("callback done");
                 }
                 debug2("channel %d: open confirm rwindow %u rmax %u", c->self,
@@ -2303,7 +2347,7 @@ channel_input_port_open(int type, u_int32_t seq, void *ctxt)
         Channel *c = NULL;
         u_short host_port;
         char *host, *originator_string;
-        int remote_id, sock = -1;
+        int remote_id;
 
         remote_id = packet_get_int();
         host = packet_get_string(NULL);
@@ -2315,22 +2359,46 @@ channel_input_port_open(int type, u_int32_t seq, void *ctxt)
                 originator_string = xstrdup("unknown (remote did not supply name)");
         }
         packet_check_eom();
-        sock = channel_connect_to(host, host_port);
-        if (sock != -1) {
-                c = channel_new("connected socket",
-                    SSH_CHANNEL_CONNECTING, sock, sock, -1, 0, 0, 0,
-                    originator_string, 1);
-                c->remote_id = remote_id;
-        }
+        c = channel_connect_to(host, host_port,
+            "connected socket", originator_string);
         xfree(originator_string);
+        xfree(host);
         if (c == NULL) {
                 packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE);
                 packet_put_int(remote_id);
                 packet_send();
-        }
-        xfree(host);
+        } else
+                c->remote_id = remote_id;
 }
 
+/* ARGSUSED */
+void
+channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
+{
+        Channel *c;
+        struct channel_confirm *cc;
+        int remote_id;
+
+        /* Reset keepalive timeout */
+        keep_alive_timeouts = 0;
+
+        remote_id = packet_get_int();
+        packet_check_eom();
+
+        debug2("channel_input_confirm: type %d id %d", type, remote_id);
+
+        if ((c = channel_lookup(remote_id)) == NULL) {
+                logit("channel_input_success_failure: %d: unknown", remote_id);
+                return;
+        }       
+        ;
+        if ((cc = TAILQ_FIRST(&c->status_confirms)) == NULL)
+                return;
+        cc->cb(type, c, cc->ctx);
+        TAILQ_REMOVE(&c->status_confirms, cc, entry);
+        bzero(cc, sizeof(*cc));
+        xfree(cc);
+}
 
 /* -- tcp forwarding */
 
@@ -2385,7 +2453,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
                         wildcard = 1;
         } else if (gateway_ports || is_client) {
                 if (((datafellows & SSH_OLD_FORWARD_ADDR) &&
-                    strcmp(listen_addr, "0.0.0.0") == 0) ||
+                    strcmp(listen_addr, "0.0.0.0") == 0 && is_client == 0) ||
                     *listen_addr == '\0' || strcmp(listen_addr, "*") == 0 ||
                     (!is_client && gateway_ports == 1))
                         wildcard = 1;
@@ -2409,10 +2477,11 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
                 if (addr == NULL) {
                         /* This really shouldn't happen */
                         packet_disconnect("getaddrinfo: fatal error: %s",
-                            gai_strerror(r));
+                            ssh_gai_strerror(r));
                 } else {
                         error("channel_setup_fwd_listener: "
-                            "getaddrinfo(%.64s): %s", addr, gai_strerror(r));
+                            "getaddrinfo(%.64s): %s", addr,
+                            ssh_gai_strerror(r));
                 }
                 return 0;
         }
@@ -2717,35 +2786,37 @@ channel_clear_adm_permitted_opens(void)
         num_adm_permitted_opens = 0;
 }
 
-/* return socket to remote host, port */
+void
+channel_print_adm_permitted_opens(void)
+{
+        int i;
+
+        for (i = 0; i < num_adm_permitted_opens; i++)
+                if (permitted_adm_opens[i].host_to_connect != NULL)
+                        printf(" %s:%d", permitted_adm_opens[i].host_to_connect,
+                            permitted_adm_opens[i].port_to_connect);
+}
+
+/* Try to start non-blocking connect to next host in cctx list */
 static int
-connect_to(const char *host, u_short port)
+connect_next(struct channel_connect *cctx)
 {
-        struct addrinfo hints, *ai, *aitop;
+        int sock, saved_errno;
         char ntop[NI_MAXHOST], strport[NI_MAXSERV];
-        int gaierr;
-        int sock = -1;
 
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = IPv4or6;
-        hints.ai_socktype = SOCK_STREAM;
-        snprintf(strport, sizeof strport, "%d", port);
-        if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) {
-                error("connect_to %.100s: unknown host (%s)", host,
-                    gai_strerror(gaierr));
-                return -1;
-        }
-        for (ai = aitop; ai; ai = ai->ai_next) {
-                if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
+        for (; cctx->ai; cctx->ai = cctx->ai->ai_next) {
+                if (cctx->ai->ai_family != AF_INET &&
+                    cctx->ai->ai_family != AF_INET6)
                         continue;
-                if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, sizeof(ntop),
-                    strport, sizeof(strport), NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-                        error("connect_to: getnameinfo failed");
+                if (getnameinfo(cctx->ai->ai_addr, cctx->ai->ai_addrlen,
+                    ntop, sizeof(ntop), strport, sizeof(strport),
+                    NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+                        error("connect_next: getnameinfo failed");
                         continue;
                 }
-                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-                if (sock < 0) {
-                        if (ai->ai_next == NULL)
+                if ((sock = socket(cctx->ai->ai_family, cctx->ai->ai_socktype,
+                    cctx->ai->ai_protocol)) == -1) {
+                        if (cctx->ai->ai_next == NULL)
                                 error("socket: %.100s", strerror(errno));
                         else
                                 verbose("socket: %.100s", strerror(errno));
@@ -2753,45 +2824,95 @@ connect_to(const char *host, u_short port)
                 }
                 if (set_nonblock(sock) == -1)
                         fatal("%s: set_nonblock(%d)", __func__, sock);
-                if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 &&
-                    errno != EINPROGRESS) {
-                        error("connect_to %.100s port %s: %.100s", ntop, strport,
+                if (connect(sock, cctx->ai->ai_addr,
+                    cctx->ai->ai_addrlen) == -1 && errno != EINPROGRESS) {
+                        debug("connect_next: host %.100s ([%.100s]:%s): "
+                            "%.100s", cctx->host, ntop, strport,
                             strerror(errno));
+                        saved_errno = errno;
                         close(sock);
+                        errno = saved_errno;
                         continue;       /* fail -- try next */
                 }
-                break; /* success */
+                debug("connect_next: host %.100s ([%.100s]:%s) "
+                    "in progress, fd=%d", cctx->host, ntop, strport, sock);
+                cctx->ai = cctx->ai->ai_next;
+                set_nodelay(sock);
+                return sock;
+        }
+        return -1;
+}
 
+static void
+channel_connect_ctx_free(struct channel_connect *cctx)
+{
+        xfree(cctx->host);
+        if (cctx->aitop)
+                freeaddrinfo(cctx->aitop);
+        bzero(cctx, sizeof(*cctx));
+        cctx->host = NULL;
+        cctx->ai = cctx->aitop = NULL;
+}
+
+/* Return CONNECTING channel to remote host, port */
+static Channel *
+connect_to(const char *host, u_short port, char *ctype, char *rname)
+{
+        struct addrinfo hints;
+        int gaierr;
+        int sock = -1;
+        char strport[NI_MAXSERV];
+        struct channel_connect cctx;
+        Channel *c;
+
+        memset(&cctx, 0, sizeof(cctx));
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = IPv4or6;
+        hints.ai_socktype = SOCK_STREAM;
+        snprintf(strport, sizeof strport, "%d", port);
+        if ((gaierr = getaddrinfo(host, strport, &hints, &cctx.aitop)) != 0) {
+                error("connect_to %.100s: unknown host (%s)", host,
+                    ssh_gai_strerror(gaierr));
+                return NULL;
         }
-        freeaddrinfo(aitop);
-        if (!ai) {
-                error("connect_to %.100s port %d: failed.", host, port);
-                return -1;
+
+        cctx.host = xstrdup(host);
+        cctx.port = port;
+        cctx.ai = cctx.aitop;
+
+        if ((sock = connect_next(&cctx)) == -1) {
+                error("connect to %.100s port %d failed: %s",
+                    host, port, strerror(errno));
+                channel_connect_ctx_free(&cctx);
+                return NULL;
         }
-        /* success */
-        set_nodelay(sock);
-        return sock;
+        c = channel_new(ctype, SSH_CHANNEL_CONNECTING, sock, sock, -1,
+            CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, rname, 1);
+        c->connect_ctx = cctx;
+        return c;
 }
 
-int
-channel_connect_by_listen_address(u_short listen_port)
+Channel *
+channel_connect_by_listen_address(u_short listen_port, char *ctype, char *rname)
 {
         int i;
 
-        for (i = 0; i < num_permitted_opens; i++)
+        for (i = 0; i < num_permitted_opens; i++) {
                 if (permitted_opens[i].host_to_connect != NULL &&
-                    permitted_opens[i].listen_port == listen_port)
+                    permitted_opens[i].listen_port == listen_port) {
                         return connect_to(
                             permitted_opens[i].host_to_connect,
-                            permitted_opens[i].port_to_connect);
+                            permitted_opens[i].port_to_connect, ctype, rname);
+                }
+        }
         error("WARNING: Server requests forwarding for unknown listen_port %d",
             listen_port);
-        return -1;
+        return NULL;
 }
 
 /* Check if connecting to that port is permitted and connect. */
-int
-channel_connect_to(const char *host, u_short port)
+Channel *
+channel_connect_to(const char *host, u_short port, char *ctype, char *rname)
 {
         int i, permit, permit_adm = 1;
 
@@ -2817,9 +2938,9 @@ channel_connect_to(const char *host, u_short port)
         if (!permit || !permit_adm) {
                 logit("Received request to connect to host %.100s port %d, "
                     "but the request was denied.", host, port);
-                return -1;
+                return NULL;
         }
-        return connect_to(host, port);
+        return connect_to(host, port, ctype, rname);
 }
 
 void
@@ -2874,7 +2995,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                 hints.ai_socktype = SOCK_STREAM;
                 snprintf(strport, sizeof strport, "%d", port);
                 if ((gaierr = getaddrinfo(NULL, strport, &hints, &aitop)) != 0) {
-                        error("getaddrinfo: %.100s", gai_strerror(gaierr));
+                        error("getaddrinfo: %.100s", ssh_gai_strerror(gaierr));
                         return -1;
                 }
                 for (ai = aitop; ai; ai = ai->ai_next) {
@@ -2904,7 +3025,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                                         error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));
                         }
 #endif
-                        channel_set_reuseaddr(sock);
+                        if (x11_use_localhost)
+                                channel_set_reuseaddr(sock);
                         if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
                                 debug2("bind port %d: %.100s", port, strerror(errno));
                                 close(sock);
@@ -2916,17 +3038,8 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                                 break;
                         }
                         socks[num_socks++] = sock;
-#ifndef DONT_TRY_OTHER_AF
                         if (num_socks == NUM_SOCKS)
                                 break;
-#else
-                        if (x11_use_localhost) {
-                                if (num_socks == NUM_SOCKS)
-                                        break;
-                        } else {
-                                break;
-                        }
-#endif
                 }
                 freeaddrinfo(aitop);
                 if (num_socks > 0)
@@ -3048,7 +3161,8 @@ x11_connect_display(void)
         hints.ai_socktype = SOCK_STREAM;
         snprintf(strport, sizeof strport, "%u", 6000 + display_number);
         if ((gaierr = getaddrinfo(buf, strport, &hints, &aitop)) != 0) {
-                error("%.100s: unknown host. (%s)", buf, gai_strerror(gaierr));
+                error("%.100s: unknown host. (%s)", buf,
+                ssh_gai_strerror(gaierr));
                 return -1;
         }
         for (ai = aitop; ai; ai = ai->ai_next) {