From 30c3d429306bb4afe71c18db92816b981f7b6d9d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 9 May 2000 11:02:59 +1000 Subject: - OpenBSD CVS update - markus@cvs.openbsd.org [cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c] [ssh.h sshconnect1.c sshconnect2.c sshd.8] - complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only) - hugh@cvs.openbsd.org [ssh.1] - zap typo [ssh-keygen.1] - One last nit fix. (markus approved) [sshd.8] - some markus certified spelling adjustments - markus@cvs.openbsd.org [auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c] [sshconnect2.c ] - bug compat w/ ssh-2.0.13 x11, split out bugs [nchan.c] - no drain if ibuf_empty, fixes x11fwd problems; tests by fries@ [ssh-keygen.c] - handle escapes in real and original key format, ok millert@ [version.h] - OpenSSH-2.1 --- nchan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nchan.c') diff --git a/nchan.c b/nchan.c index b00686a48..0ea88da33 100644 --- a/nchan.c +++ b/nchan.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$Id: nchan.c,v 1.9 2000/05/07 02:03:16 damien Exp $"); +RCSID("$Id: nchan.c,v 1.10 2000/05/09 01:03:01 damien Exp $"); #include "ssh.h" @@ -107,6 +107,10 @@ 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 (buffer_len(&c->input) == 0) { + debug("channel %d: input: no drain shortcut", c->self); + chan_ibuf_empty(c); + } break; default: error("channel %d: internal error: we do not read, but chan_read_failed for istate %d", -- cgit v1.2.3