diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2005-07-17 06:49:05 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2005-07-17 06:49:05 +0000 |
| commit | f437a54b8f92fd168212545d732da6323366f937 (patch) | |
| tree | a2369a7654fb23cf4292a633212126b8f728ee52 /usr.bin/ssh/channels.h | |
| parent | 4370aee2db0cacfde63527b50090453554f0dbb1 (diff) | |
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.h | 4 |
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 *); |