diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-06-25 23:15:37 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-06-25 23:15:37 +0000 |
| commit | 37b7c4178ce4de69ad41a48888a3aa5d8165bf8e (patch) | |
| tree | 7336646978c813d26219442c6bc55604b8320c42 /usr.bin/ssh/clientloop.h | |
| parent | 526de9c160c5b187a1106695c0bedfa263e00eb4 (diff) | |
Add X11ForwardTimeout option to specify timeout for untrusted X11
authentication cookies to avoid fallback in X11 code to fully-trusted
implicit authentication using SO_PEERCRED described at:
http://lists.x.org/archives/xorg-devel/2010-May/008636.html
After the X11ForwardTimeout has expired the client will now refuse
incoming X11 channel opens.
based on patch from Tavis Ormandy; "nice" markus@
Diffstat (limited to 'usr.bin/ssh/clientloop.h')
| -rw-r--r-- | usr.bin/ssh/clientloop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/clientloop.h b/usr.bin/ssh/clientloop.h index a5bc246a343..52115db6ec8 100644 --- a/usr.bin/ssh/clientloop.h +++ b/usr.bin/ssh/clientloop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.h,v 1.24 2010/05/16 12:55:51 markus Exp $ */ +/* $OpenBSD: clientloop.h,v 1.25 2010/06/25 23:15:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -39,7 +39,7 @@ /* Client side main loop for the interactive session. */ int client_loop(int, int, int); -void client_x11_get_proto(const char *, const char *, u_int, +void client_x11_get_proto(const char *, const char *, u_int, u_int, char **, char **); void client_global_request_reply_fwd(int, u_int32_t, void *); void client_session2_setup(int, int, int, const char *, struct termios *, |