summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-07-01 02:26:31 +0000
committerDamien Miller <djm@mindrot.org>2015-07-01 12:29:43 +1000
commit1bf477d3cdf1a864646d59820878783d42357a1d (patch)
tree51d4c6538c262177bf76316eba414a6202964b36 /channels.h
parent47aa7a0f8551b471fcae0447c1d78464f6dba869 (diff)
upstream commit
better refuse ForwardX11Trusted=no connections attempted after ForwardX11Timeout expires; reported by Jann Horn Upstream-ID: bf0fddadc1b46a0334e26c080038313b4b6dea21
Diffstat (limited to 'channels.h')
-rw-r--r--channels.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/channels.h b/channels.h
index b9b486027..9d76c9d2a 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.117 2015/05/08 06:45:13 djm Exp $ */ 1/* $OpenBSD: channels.h,v 1.118 2015/07/01 02:26:31 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -284,6 +284,7 @@ int permitopen_port(const char *);
284 284
285/* x11 forwarding */ 285/* x11 forwarding */
286 286
287void channel_set_x11_refuse_time(u_int);
287int x11_connect_display(void); 288int x11_connect_display(void);
288int x11_create_display_inet(int, int, int, u_int *, int **); 289int x11_create_display_inet(int, int, int, u_int *, int **);
289int x11_input_open(int, u_int32_t, void *); 290int x11_input_open(int, u_int32_t, void *);