=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/nchan.c,v retrieving revision 1.32.2.2 retrieving revision 1.32.2.3 diff -u -r1.32.2.2 -r1.32.2.3 --- src/usr.bin/ssh/nchan.c 2002/05/17 00:03:23 1.32.2.2 +++ src/usr.bin/ssh/nchan.c 2002/06/22 07:23:17 1.32.2.3 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: nchan.c,v 1.32.2.2 2002/05/17 00:03:23 miod Exp $"); +RCSID("$OpenBSD: nchan.c,v 1.32.2.3 2002/06/22 07:23:17 miod Exp $"); #include "ssh1.h" #include "ssh2.h" @@ -367,7 +367,7 @@ else chan_rcvd_ieof1(c); if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN && - buffer_len(&c->output) == 0 && + buffer_len(&c->output) == 0 && !CHANNEL_EFD_OUTPUT_ACTIVE(c)) chan_obuf_empty(c); } @@ -411,8 +411,8 @@ c->extended_usage == CHAN_EXTENDED_WRITE && c->efd != -1 && buffer_len(&c->extended) > 0) { - debug2("channel %d: active efd: %d len %d", - c->self, c->efd, buffer_len(&c->extended)); + debug2("channel %d: active efd: %d len %d", + c->self, c->efd, buffer_len(&c->extended)); return 0; } if (!(c->flags & CHAN_CLOSE_SENT)) {