diff options
| author | des <des@FreeBSD.org> | 2005-09-03 06:59:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-03 06:59:33 +0000 |
| commit | 755a16fa864cacbbd9fbefc822011b6741351d8d (patch) | |
| tree | b8088b859d6543143de670740f5c6f7bf4e0b23d /crypto/openssh/channels.h | |
| parent | c4dfc1ed3bdacd05d73791b2c8f8b580511a939f (diff) | |
| download | FreeBSD-src-755a16fa864cacbbd9fbefc822011b6741351d8d.zip FreeBSD-src-755a16fa864cacbbd9fbefc822011b6741351d8d.tar.gz | |
Vendor import of OpenSSH 4.2p1.
Diffstat (limited to 'crypto/openssh/channels.h')
| -rw-r--r-- | crypto/openssh/channels.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/openssh/channels.h b/crypto/openssh/channels.h index fc20fb2..1cb2c3a 100644 --- a/crypto/openssh/channels.h +++ b/crypto/openssh/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.76 2005/03/01 10:09:52 djm Exp $ */ +/* $OpenBSD: channels.h,v 1.79 2005/07/17 06:49:04 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -149,7 +149,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|CHAN_CLOSE_RCVD))) || \ + c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \ buffer_len(&c->extended) > 0)) /* channel management */ @@ -214,9 +214,10 @@ int channel_cancel_rport_listener(const char *, u_short); /* x11 forwarding */ int x11_connect_display(void); -int x11_create_display_inet(int, int, int, u_int *); +int x11_create_display_inet(int, int, int, u_int *, int **); void x11_input_open(int, u_int32_t, void *); -void x11_request_forwarding_with_spoofing(int, const char *, const char *); +void x11_request_forwarding_with_spoofing(int, const char *, const char *, + const char *); void deny_input_open(int, u_int32_t, void *); /* agent forwarding */ |
