summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authordjm <djm>2005-07-17 07:19:24 +0000
committerdjm <djm>2005-07-17 07:19:24 +0000
commit5b6c0cbc9a69cf92c93a0fe33bb11c8e3454efba (patch)
tree830487c7acab914f604ad99ce779313e898a4b12 /channels.h
parentbbf1c740003ffabba95f9dd3990c2ed15cfc3d46 (diff)
downloadopenssh-5b6c0cbc9a69cf92c93a0fe33bb11c8e3454efba.tar.gz
- (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line
- djm@cvs.openbsd.org 2005/07/17 06:49:04 [channels.c channels.h session.c session.h] 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 'channels.h')
-rw-r--r--channels.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.h b/channels.h
index b89b7c95..1cb2c3a3 100644
--- a/channels.h
+++ b/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>
@@ -214,7 +214,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 *);