- markus@cvs.openbsd.org 2002/01/14 13:41:13

     [nchan.c]
     remove duplicated code; ok provos@

diff --git a/ChangeLog b/ChangeLog
index a9bdc636bf437d179249d080c8ddb272dbbcb5a2..824bcb5f733050967dc7218ede3ea700dfab80fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -173,6 +173,9 @@
      [nchan.c]
      correct fn names for ssh2, do not switch from closed to closed; 
      ok provos@
+   - markus@cvs.openbsd.org 2002/01/14 13:41:13
+     [nchan.c]
+     remove duplicated code; ok provos@
 
 20020121
  - (djm) Rework ssh-rand-helper:

diff --git a/nchan.c b/nchan.c
index 8b793714e9e0b8f69ee0d4537713f8f3ccb6dab1..9ecf42105f923eb5bd8e4bf47b8529817086a253 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.41 2002/01/14 13:41:13 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -324,9 +324,6 @@ chan_write_failed2(Channel *c)
        debug("channel %d: write failed", c->self);
        switch (c->ostate) {
        case CHAN_OUTPUT_OPEN:
-               chan_shutdown_write(c); /* ?? */
-               chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
-               break;
        case CHAN_OUTPUT_WAIT_DRAIN:
                chan_shutdown_write(c);
                chan_set_ostate(c, CHAN_OUTPUT_CLOSED);