diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
tree | a65f45e0073cb55ad42957a36b4636ff21405108 /nchan.c | |
parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) |
- 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
Diffstat (limited to 'nchan.c')
-rw-r--r-- | nchan.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$Id: nchan.c,v 1.9 2000/05/07 02:03:16 damien Exp $"); | 31 | RCSID("$Id: nchan.c,v 1.10 2000/05/09 01:03:01 damien Exp $"); |
32 | 32 | ||
33 | #include "ssh.h" | 33 | #include "ssh.h" |
34 | 34 | ||
@@ -107,6 +107,10 @@ chan_read_failed_12(Channel *c) | |||
107 | debug("channel %d: input open -> drain", c->self); | 107 | debug("channel %d: input open -> drain", c->self); |
108 | chan_shutdown_read(c); | 108 | chan_shutdown_read(c); |
109 | c->istate = CHAN_INPUT_WAIT_DRAIN; | 109 | c->istate = CHAN_INPUT_WAIT_DRAIN; |
110 | if (buffer_len(&c->input) == 0) { | ||
111 | debug("channel %d: input: no drain shortcut", c->self); | ||
112 | chan_ibuf_empty(c); | ||
113 | } | ||
110 | break; | 114 | break; |
111 | default: | 115 | default: |
112 | error("channel %d: internal error: we do not read, but chan_read_failed for istate %d", | 116 | error("channel %d: internal error: we do not read, but chan_read_failed for istate %d", |