diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-07-15 00:24:30 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-07-15 14:20:10 +1000 |
commit | ed877ef653847d056bb433975d731b7a1132a979 (patch) | |
tree | 855230b944a0fc2eebdaa4c037f911e28ff21e17 /readconf.h | |
parent | 5c02dd126206a26785379e80f2d3848e4470b711 (diff) |
upstream commit
Add a ProxyJump ssh_config(5) option and corresponding -J
ssh(1) command-line flag to allow simplified indirection through a SSH
bastion or "jump host".
These options construct a proxy command that connects to the
specified jump host(s) (more than one may be specified) and uses
port-forwarding to establish a connection to the next destination.
This codifies the safest way of indirecting connections through SSH
servers and makes it easy to use.
ok markus@
Upstream-ID: fa899cb8b26d889da8f142eb9774c1ea36b04397
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index a8b0b9188..cef55f71c 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.116 2016/06/03 03:14:41 dtucker 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> |
@@ -163,6 +163,11 @@ typedef struct { | |||
163 | char *hostbased_key_types; | 163 | char *hostbased_key_types; |
164 | char *pubkey_key_types; | 164 | char *pubkey_key_types; |
165 | 165 | ||
166 | char *jump_user; | ||
167 | char *jump_host; | ||
168 | int jump_port; | ||
169 | char *jump_extra; | ||
170 | |||
166 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ | 171 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ |
167 | } Options; | 172 | } Options; |
168 | 173 | ||
@@ -198,6 +203,7 @@ int process_config_line(Options *, struct passwd *, const char *, | |||
198 | int read_config_file(const char *, struct passwd *, const char *, | 203 | int read_config_file(const char *, struct passwd *, const char *, |
199 | const char *, Options *, int); | 204 | const char *, Options *, int); |
200 | 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); | ||
201 | int default_ssh_port(void); | 207 | int default_ssh_port(void); |
202 | int option_clear_or_none(const char *); | 208 | int option_clear_or_none(const char *); |
203 | void dump_client_config(Options *o, const char *host); | 209 | void dump_client_config(Options *o, const char *host); |