- (djm) Stop shadow expiry checking from preventing logins with NIS. Based

[openssh.git] / nchan.c

diff --git a/nchan.c b/nchan.c
index 51e5ba3c21112cc3a2863cb4a0bbd58f4b4640a6..cef56497bc1b29b428002845c114900e3857343a 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: nchan.c,v 1.18 2000/06/20 01:39:42 markus 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",