diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | nchan.c | 5 |
2 files changed, 5 insertions, 5 deletions
@@ -173,6 +173,9 @@ | |||
173 | [nchan.c] | 173 | [nchan.c] |
174 | correct fn names for ssh2, do not switch from closed to closed; | 174 | correct fn names for ssh2, do not switch from closed to closed; |
175 | ok provos@ | 175 | ok provos@ |
176 | - markus@cvs.openbsd.org 2002/01/14 13:41:13 | ||
177 | [nchan.c] | ||
178 | remove duplicated code; ok provos@ | ||
176 | 179 | ||
177 | 20020121 | 180 | 20020121 |
178 | - (djm) Rework ssh-rand-helper: | 181 | - (djm) Rework ssh-rand-helper: |
@@ -7320,4 +7323,4 @@ | |||
7320 | - Wrote replacements for strlcpy and mkdtemp | 7323 | - Wrote replacements for strlcpy and mkdtemp |
7321 | - Released 1.0pre1 | 7324 | - Released 1.0pre1 |
7322 | 7325 | ||
7323 | $Id: ChangeLog,v 1.1771 2002/01/22 12:28:13 djm Exp $ | 7326 | $Id: ChangeLog,v 1.1772 2002/01/22 12:28:28 djm Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $"); | 26 | RCSID("$OpenBSD: nchan.c,v 1.41 2002/01/14 13:41:13 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh1.h" | 28 | #include "ssh1.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -324,9 +324,6 @@ chan_write_failed2(Channel *c) | |||
324 | debug("channel %d: write failed", c->self); | 324 | debug("channel %d: write failed", c->self); |
325 | switch (c->ostate) { | 325 | switch (c->ostate) { |
326 | case CHAN_OUTPUT_OPEN: | 326 | case CHAN_OUTPUT_OPEN: |
327 | chan_shutdown_write(c); /* ?? */ | ||
328 | chan_set_ostate(c, CHAN_OUTPUT_CLOSED); | ||
329 | break; | ||
330 | case CHAN_OUTPUT_WAIT_DRAIN: | 327 | case CHAN_OUTPUT_WAIT_DRAIN: |
331 | chan_shutdown_write(c); | 328 | chan_shutdown_write(c); |
332 | chan_set_ostate(c, CHAN_OUTPUT_CLOSED); | 329 | chan_set_ostate(c, CHAN_OUTPUT_CLOSED); |