* 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, 15 insertions, 6 deletions

diff --git a/nchan.c b/nchan.c
index 160445e5a..20f6a2f49 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.62 2008/11/07 18:50:18 stevesk Exp $ */
+/* $OpenBSD: nchan.c,v 1.63 2010/01/26 01:28:35 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -161,7 +161,7 @@ chan_ibuf_empty(Channel *c)
         switch (c->istate) {
         case CHAN_INPUT_WAIT_DRAIN:
                 if (compat20) {
-                        if (!(c->flags & CHAN_CLOSE_SENT))
+                        if (!(c->flags & (CHAN_CLOSE_SENT|CHAN_LOCAL)))
                                 chan_send_eof2(c);
                         chan_set_istate(c, CHAN_INPUT_CLOSED);
                 } else {
@@ -278,9 +278,12 @@ static void
 chan_rcvd_close2(Channel *c)
 {
         debug2("channel %d: rcvd close", c->self);
-        if (c->flags & CHAN_CLOSE_RCVD)
-                error("channel %d: protocol error: close rcvd twice", c->self);
-        c->flags |= CHAN_CLOSE_RCVD;
+        if (!(c->flags & CHAN_LOCAL)) {
+                if (c->flags & CHAN_CLOSE_RCVD)
+                        error("channel %d: protocol error: close rcvd twice",
+                            c->self);
+                c->flags |= CHAN_CLOSE_RCVD;
+        }
         if (c->type == SSH_CHANNEL_LARVAL) {
                 /* tear down larval channels immediately */
                 chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
@@ -302,11 +305,13 @@ chan_rcvd_close2(Channel *c)
                 chan_set_istate(c, CHAN_INPUT_CLOSED);
                 break;
         case CHAN_INPUT_WAIT_DRAIN:
-                chan_send_eof2(c);
+                if (!(c->flags & CHAN_LOCAL))
+                        chan_send_eof2(c);
                 chan_set_istate(c, CHAN_INPUT_CLOSED);
                 break;
         }
 }
+
 void
 chan_rcvd_eow(Channel *c)
 {
@@ -454,6 +459,10 @@ chan_is_dead(Channel *c, int do_send)
                     c->self, c->efd, buffer_len(&c->extended));
                 return 0;
         }
+        if (c->flags & CHAN_LOCAL) {
+                debug2("channel %d: is dead (local)", c->self);
+                return 1;
+        }               
         if (!(c->flags & CHAN_CLOSE_SENT)) {
                 if (do_send) {
                         chan_send_close2(c);