diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-27 17:36:41 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-27 17:36:41 +0000 |
commit | 57686a82a5a055f53f3ae351bce21a7a93d38304 (patch) | |
tree | 6e78935ffd0c09e22e45ab96f46b84a67f889323 | |
parent | 43a5e2f70e3fc38de55b45f580e92b7be84cfa34 (diff) |
- markus@cvs.openbsd.org 2002/03/26 22:50:39
[channels.h]
CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.h | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -14,6 +14,9 @@ | |||
14 | - rees@cvs.openbsd.org 2002/03/26 18:46:59 | 14 | - rees@cvs.openbsd.org 2002/03/26 18:46:59 |
15 | [scard.c] | 15 | [scard.c] |
16 | try_AUT0 in read_pubkey too, for those paranoid few who want to acl 'sh' | 16 | try_AUT0 in read_pubkey too, for those paranoid few who want to acl 'sh' |
17 | - markus@cvs.openbsd.org 2002/03/26 22:50:39 | ||
18 | [channels.h] | ||
19 | CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too | ||
17 | 20 | ||
18 | 20020325 | 21 | 20020325 |
19 | - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h" | 22 | - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h" |
@@ -8077,4 +8080,4 @@ | |||
8077 | - Wrote replacements for strlcpy and mkdtemp | 8080 | - Wrote replacements for strlcpy and mkdtemp |
8078 | - Released 1.0pre1 | 8081 | - Released 1.0pre1 |
8079 | 8082 | ||
8080 | $Id: ChangeLog,v 1.1997 2002/03/27 17:33:17 mouring Exp $ | 8083 | $Id: ChangeLog,v 1.1998 2002/03/27 17:36:41 mouring Exp $ |
diff --git a/channels.h b/channels.h index 0da2d4e5e..bd31c4558 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.66 2002/03/25 21:13:51 markus Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.67 2002/03/26 22:50:39 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -145,7 +145,7 @@ struct Channel { | |||
145 | buffer_len(&c->extended) > 0)) | 145 | buffer_len(&c->extended) > 0)) |
146 | #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ | 146 | #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ |
147 | (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \ | 147 | (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \ |
148 | ((c->efd != -1 && !(c->flags & CHAN_EOF_RCVD)) || \ | 148 | ((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \ |
149 | buffer_len(&c->extended) > 0)) | 149 | buffer_len(&c->extended) > 0)) |
150 | 150 | ||
151 | /* channel management */ | 151 | /* channel management */ |