- Remove references to SSLeay.

 - Big OpenBSD CVS update
  - markus@cvs.openbsd.org
    [clientloop.c]
    - typo
    [session.c]
    - update proctitle on pty alloc/dealloc, e.g. w/ windows client
    [session.c]
    - update proctitle for proto 1, too
    [channels.h nchan.c serverloop.c session.c sshd.c]
    - use c-style comments
  - deraadt@cvs.openbsd.org
    [scp.c]
    - more atomicio
  - markus@cvs.openbsd.org
    [channels.c]
    - set O_NONBLOCK
    [ssh.1]
    - update AUTHOR
    [readconf.c ssh-keygen.c ssh.h]
    - default DSA key file ~/.ssh/id_dsa
    [clientloop.c]
    - typo, rm verbose debug
  - deraadt@cvs.openbsd.org
    [ssh-keygen.1]
    - document DSA use of ssh-keygen
    [sshd.8]
    - a start at describing what i understand of the DSA side
    [ssh-keygen.1]
    - document -X and -x
    [ssh-keygen.c]
    - simplify usage
  - markus@cvs.openbsd.org
    [sshd.8]
    - there is no rhosts_dsa
    [ssh-keygen.1]
    - document -y, update -X,-x
    [nchan.c]
    - fix close for non-open ssh1 channels
    [servconf.c servconf.h ssh.h sshd.8 sshd.c ]
    - s/DsaKey/HostDSAKey/, document option
    [sshconnect2.c]
    - respect number_of_password_prompts
    [channels.c channels.h servconf.c servconf.h session.c sshd.8]
    - GatewayPorts for sshd, ok deraadt@
    [ssh-add.1 ssh-agent.1 ssh.1]
    - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
    [ssh.1]
    - more info on proto 2
    [sshd.8]
    - sync AUTHOR w/ ssh.1
    [key.c key.h sshconnect.c]
    - print key type when talking about host keys
    [packet.c]
    - clear padding in ssh2
    [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
    - replace broken uuencode w/ libc b64_ntop
    [auth2.c]
    - log failure before sending the reply
    [key.c radix.c uuencode.c]
    - remote trailing comments before calling __b64_pton
    [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
    [sshconnect2.c sshd.8]
    - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
 - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])

1 files changed, 21 insertions, 2 deletions

diff --git a/nchan.c b/nchan.c
index f2dace0e4..b00686a48 100644
--- a/nchan.c
+++ b/nchan.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: nchan.c,v 1.8 2000/04/16 01:18:43 damien Exp $");
+RCSID("$Id: nchan.c,v 1.9 2000/05/07 02:03:16 damien Exp $");
 
 #include "ssh.h"
 
@@ -139,6 +139,25 @@ static void
 chan_rcvd_ieof1(Channel *c)
 {
         debug("channel %d: rcvd ieof", c->self);
+        if (c->type != SSH_CHANNEL_OPEN) {
+                debug("channel %d: non-open", c->self);
+                if (c->istate == CHAN_INPUT_OPEN) {
+                        debug("channel %d: non-open: input open -> wait_oclose", c->self);
+                        chan_shutdown_read(c);
+                        chan_send_ieof1(c);
+                        c->istate = CHAN_INPUT_WAIT_OCLOSE;
+                } else {
+                        error("channel %d: istate %d != open", c->self, c->istate);
+                }
+                if (c->ostate == CHAN_OUTPUT_OPEN) {
+                        debug("channel %d: non-open: output open -> closed", c->self);
+                        chan_send_oclose1(c);
+                        c->ostate = CHAN_OUTPUT_CLOSED;
+                } else {
+                        error("channel %d: ostate %d != open", c->self, c->ostate);
+                }
+                return;
+        }
         switch (c->ostate) {
         case CHAN_OUTPUT_OPEN:
                 debug("channel %d: output open -> drain", c->self);
@@ -314,7 +333,7 @@ chan_write_failed2(Channel *c)
         switch (c->ostate) {
         case CHAN_OUTPUT_OPEN:
                 debug("channel %d: output open -> closed", c->self);
-                chan_shutdown_write(c); // ??
+                chan_shutdown_write(c); /* ?? */
                 c->ostate = CHAN_OUTPUT_CLOSED;
                 break;
         case CHAN_OUTPUT_WAIT_DRAIN: