diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-01-14 00:04:47 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-01-14 00:06:01 +0100 |
| commit | ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c (patch) | |
| tree | 008ac3334471370857e32b48893cb6f07d28e987 /clientloop.h | |
| parent | upstream commit (diff) | |
| download | openssh-ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c.tar.xz openssh-ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c.zip | |
upstream commit
eliminate fallback from untrusted X11 forwarding to trusted
forwarding when the X server disables the SECURITY extension; Reported by
Thomas Hoger; ok deraadt@
Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938
Diffstat (limited to 'clientloop.h')
| -rw-r--r-- | clientloop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.h b/clientloop.h index 338d45186..f4d4c69b7 100644 --- a/clientloop.h +++ b/clientloop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.h,v 1.31 2013/06/02 23:36:29 dtucker Exp $ */ +/* $OpenBSD: clientloop.h,v 1.32 2016/01/13 23:04:47 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, u_int, +int 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 *, |