From 6c112acadf21e3679b3095a062db81ad24c1a11f Mon Sep 17 00:00:00 2001 From: mouring Date: Wed, 27 Mar 2002 17:36:41 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2002/03/26 22:50:39 [channels.h] CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too --- ChangeLog | 3 +++ channels.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 206aa270..af0cbf1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ - rees@cvs.openbsd.org 2002/03/26 18:46:59 [scard.c] try_AUT0 in read_pubkey too, for those paranoid few who want to acl 'sh' + - markus@cvs.openbsd.org 2002/03/26 22:50:39 + [channels.h] + CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too 20020325 - (stevesk) import OpenBSD as "openbsd-compat/tree.h" diff --git a/channels.h b/channels.h index 0da2d4e5..bd31c455 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.66 2002/03/25 21:13:51 markus Exp $ */ +/* $OpenBSD: channels.h,v 1.67 2002/03/26 22:50:39 markus Exp $ */ /* * Author: Tatu Ylonen @@ -145,7 +145,7 @@ struct Channel { buffer_len(&c->extended) > 0)) #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \ - ((c->efd != -1 && !(c->flags & CHAN_EOF_RCVD)) || \ + ((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \ buffer_len(&c->extended) > 0)) /* channel management */ -- 2.45.2