summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/channels.h
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2005-07-17 06:49:04 +0000
committerdjm <djm@openbsd.org>2005-07-17 06:49:04 +0000
commit6aa873e0714070001628b7e7dfbb03948d730e46 (patch)
treeb67cdd286bbbfccd0eb25c4088480cb0815cc13a /usr.bin/ssh/channels.h
parentmove headers and remove some FreeBSD specific stuff. (diff)
downloadwireguard-openbsd-6aa873e0714070001628b7e7dfbb03948d730e46.tar.xz
wireguard-openbsd-6aa873e0714070001628b7e7dfbb03948d730e46.zip
Fix a number of X11 forwarding channel leaks:
1. Refuse multiple X11 forwarding requests on the same session 2. Clean up all listeners after a single_connection X11 forward, not just the one that made the single connection 3. Destroy X11 listeners when the session owning them goes away testing and ok dtucker@
Diffstat (limited to 'usr.bin/ssh/channels.h')
-rw-r--r--usr.bin/ssh/channels.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 139a41826e7..27e760858c7 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.78 2005/07/08 09:41:33 markus Exp $ */
+/* $OpenBSD: channels.h,v 1.79 2005/07/17 06:49:04 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -213,7 +213,7 @@ 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 *,
const char *);