diff options
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index c84d068bd..cef55f71c 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.113 2016/01/14 16:17:40 markus Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.117 2016/07/15 00:24:30 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -101,6 +101,7 @@ typedef struct { | |||
101 | struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES]; | 101 | struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES]; |
102 | 102 | ||
103 | int add_keys_to_agent; | 103 | int add_keys_to_agent; |
104 | char *identity_agent; /* Optional path to ssh-agent socket */ | ||
104 | 105 | ||
105 | /* Local TCP/IP forward requests. */ | 106 | /* Local TCP/IP forward requests. */ |
106 | int num_local_forwards; | 107 | int num_local_forwards; |
@@ -111,6 +112,10 @@ typedef struct { | |||
111 | struct Forward *remote_forwards; | 112 | struct Forward *remote_forwards; |
112 | int clear_forwardings; | 113 | int clear_forwardings; |
113 | 114 | ||
115 | /* stdio forwarding (-W) host and port */ | ||
116 | char *stdio_forward_host; | ||
117 | int stdio_forward_port; | ||
118 | |||
114 | int enable_ssh_keysign; | 119 | int enable_ssh_keysign; |
115 | int64_t rekey_limit; | 120 | int64_t rekey_limit; |
116 | int rekey_interval; | 121 | int rekey_interval; |
@@ -158,6 +163,11 @@ typedef struct { | |||
158 | char *hostbased_key_types; | 163 | char *hostbased_key_types; |
159 | char *pubkey_key_types; | 164 | char *pubkey_key_types; |
160 | 165 | ||
166 | char *jump_user; | ||
167 | char *jump_host; | ||
168 | int jump_port; | ||
169 | char *jump_extra; | ||
170 | |||
161 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ | 171 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ |
162 | } Options; | 172 | } Options; |
163 | 173 | ||
@@ -179,6 +189,7 @@ typedef struct { | |||
179 | #define SSHCONF_CHECKPERM 1 /* check permissions on config file */ | 189 | #define SSHCONF_CHECKPERM 1 /* check permissions on config file */ |
180 | #define SSHCONF_USERCONF 2 /* user provided config file not system */ | 190 | #define SSHCONF_USERCONF 2 /* user provided config file not system */ |
181 | #define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ | 191 | #define SSHCONF_POSTCANON 4 /* After hostname canonicalisation */ |
192 | #define SSHCONF_NEVERMATCH 8 /* Match/Host never matches; internal only */ | ||
182 | 193 | ||
183 | #define SSH_UPDATE_HOSTKEYS_NO 0 | 194 | #define SSH_UPDATE_HOSTKEYS_NO 0 |
184 | #define SSH_UPDATE_HOSTKEYS_YES 1 | 195 | #define SSH_UPDATE_HOSTKEYS_YES 1 |
@@ -192,6 +203,7 @@ int process_config_line(Options *, struct passwd *, const char *, | |||
192 | int read_config_file(const char *, struct passwd *, const char *, | 203 | int read_config_file(const char *, struct passwd *, const char *, |
193 | const char *, Options *, int); | 204 | const char *, Options *, int); |
194 | int parse_forward(struct Forward *, const char *, int, int); | 205 | int parse_forward(struct Forward *, const char *, int, int); |
206 | int parse_jump(const char *, Options *, int); | ||
195 | int default_ssh_port(void); | 207 | int default_ssh_port(void); |
196 | int option_clear_or_none(const char *); | 208 | int option_clear_or_none(const char *); |
197 | void dump_client_config(Options *o, const char *host); | 209 | void dump_client_config(Options *o, const char *host); |