summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h
index fd31bd40f..f81eaff47 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.82 2010/02/08 10:50:20 markus Exp $ */ 1/* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,6 +23,7 @@ typedef struct {
23 int listen_port; /* Port to forward. */ 23 int listen_port; /* Port to forward. */
24 char *connect_host; /* Host to connect. */ 24 char *connect_host; /* Host to connect. */
25 int connect_port; /* Port to connect on connect_host. */ 25 int connect_port; /* Port to connect on connect_host. */
26 int allocated_port; /* Dynamically allocated listen port */
26} Forward; 27} Forward;
27/* Data structure for representing option data. */ 28/* Data structure for representing option data. */
28 29
@@ -31,6 +32,7 @@ typedef struct {
31typedef struct { 32typedef struct {
32 int forward_agent; /* Forward authentication agent. */ 33 int forward_agent; /* Forward authentication agent. */
33 int forward_x11; /* Forward X11 display. */ 34 int forward_x11; /* Forward X11 display. */
35 int forward_x11_timeout; /* Expiration for Cookies */
34 int forward_x11_trusted; /* Trust Forward X11 display. */ 36 int forward_x11_trusted; /* Trust Forward X11 display. */
35 int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ 37 int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */
36 char *xauth_location; /* Location for xauth program */ 38 char *xauth_location; /* Location for xauth program */
@@ -97,11 +99,11 @@ typedef struct {
97 99
98 /* Local TCP/IP forward requests. */ 100 /* Local TCP/IP forward requests. */
99 int num_local_forwards; 101 int num_local_forwards;
100 Forward local_forwards[SSH_MAX_FORWARDS_PER_DIRECTION]; 102 Forward *local_forwards;
101 103
102 /* Remote TCP/IP forward requests. */ 104 /* Remote TCP/IP forward requests. */
103 int num_remote_forwards; 105 int num_remote_forwards;
104 Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION]; 106 Forward *remote_forwards;
105 int clear_forwardings; 107 int clear_forwardings;
106 108
107 int enable_ssh_keysign; 109 int enable_ssh_keysign;
@@ -116,6 +118,8 @@ typedef struct {
116 118
117 char *control_path; 119 char *control_path;
118 int control_master; 120 int control_master;
121 int control_persist; /* ControlPersist flag */
122 int control_persist_timeout; /* ControlPersist timeout (seconds) */
119 123
120 int hash_known_hosts; 124 int hash_known_hosts;
121 125