summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nchan.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ff22e182..2d6a845f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,9 @@
- markus@cvs.openbsd.org 2002/01/10 11:24:04
[clientloop.c]
handle SSH2_MSG_GLOBAL_REQUEST (just reply with failure); ok djm@
+ - markus@cvs.openbsd.org 2002/01/10 12:38:26
+ [nchan.c]
+ remove dead code (skip drain)
20020121
@@ -7264,4 +7267,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1756 2002/01/22 12:21:58 djm Exp $
+$Id: ChangeLog,v 1.1757 2002/01/22 12:22:20 djm Exp $
diff --git a/nchan.c b/nchan.c
index ae1fe47c..79fff66c 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.34 2002/01/09 17:26:35 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.35 2002/01/10 12:38:26 markus Exp $");
#include "ssh1.h"
#include "ssh2.h"
@@ -123,12 +123,6 @@ chan_read_failed_12(Channel *c)
debug("channel %d: input open -> drain", c->self);
chan_shutdown_read(c);
c->istate = CHAN_INPUT_WAIT_DRAIN;
-#if 0
- if (buffer_len(&c->input) == 0) {
- debug("channel %d: input: no drain shortcut", c->self);
- chan_ibuf_empty(c);
- }
-#endif
break;
default:
error("channel %d: chan_read_failed for istate %d",