diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-05 23:58:12 +0100 |
commit | 0556ea972b15607b7e13ff31bc05840881c91dd3 (patch) | |
tree | d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /readconf.h | |
parent | db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff) | |
parent | 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff) |
New upstream release (7.6p1)
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/readconf.h b/readconf.h index fd3d7c75d..d61161a84 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.117 2016/07/15 00:24:30 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.123 2017/09/03 23:33:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -37,9 +37,6 @@ typedef struct { | |||
37 | char *xauth_location; /* Location for xauth program */ | 37 | char *xauth_location; /* Location for xauth program */ |
38 | struct ForwardOptions fwd_opts; /* forwarding options */ | 38 | struct ForwardOptions fwd_opts; /* forwarding options */ |
39 | int use_privileged_port; /* Don't use privileged port if false. */ | 39 | int use_privileged_port; /* Don't use privileged port if false. */ |
40 | int rhosts_rsa_authentication; /* Try rhosts with RSA | ||
41 | * authentication. */ | ||
42 | int rsa_authentication; /* Try RSA authentication. */ | ||
43 | int pubkey_authentication; /* Try ssh2 pubkey authentication. */ | 40 | int pubkey_authentication; /* Try ssh2 pubkey authentication. */ |
44 | int hostbased_authentication; /* ssh2's rhosts_rsa */ | 41 | int hostbased_authentication; /* ssh2's rhosts_rsa */ |
45 | int challenge_response_authentication; | 42 | int challenge_response_authentication; |
@@ -59,11 +56,10 @@ typedef struct { | |||
59 | int check_host_ip; /* Also keep track of keys for IP address */ | 56 | int check_host_ip; /* Also keep track of keys for IP address */ |
60 | int strict_host_key_checking; /* Strict host key checking. */ | 57 | int strict_host_key_checking; /* Strict host key checking. */ |
61 | int compression; /* Compress packets in both directions. */ | 58 | int compression; /* Compress packets in both directions. */ |
62 | int compression_level; /* Compression level 1 (fast) to 9 | ||
63 | * (best). */ | ||
64 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ | 59 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ |
65 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ | 60 | int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ |
66 | int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ | 61 | int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ |
62 | SyslogFacility log_facility; /* Facility for system logging. */ | ||
67 | LogLevel log_level; /* Level for logging. */ | 63 | LogLevel log_level; /* Level for logging. */ |
68 | 64 | ||
69 | int port; /* Port to connect. */ | 65 | int port; /* Port to connect. */ |
@@ -74,12 +70,10 @@ typedef struct { | |||
74 | * aborting connection attempt */ | 70 | * aborting connection attempt */ |
75 | int number_of_password_prompts; /* Max number of password | 71 | int number_of_password_prompts; /* Max number of password |
76 | * prompts. */ | 72 | * prompts. */ |
77 | int cipher; /* Cipher to use. */ | ||
78 | char *ciphers; /* SSH2 ciphers in order of preference. */ | 73 | char *ciphers; /* SSH2 ciphers in order of preference. */ |
79 | char *macs; /* SSH2 macs in order of preference. */ | 74 | char *macs; /* SSH2 macs in order of preference. */ |
80 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ | 75 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ |
81 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ | 76 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ |
82 | int protocol; /* Protocol in order of preference. */ | ||
83 | char *hostname; /* Real host to connect. */ | 77 | char *hostname; /* Real host to connect. */ |
84 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ | 78 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ |
85 | char *proxy_command; /* Proxy command for connecting the host. */ | 79 | char *proxy_command; /* Proxy command for connecting the host. */ |
@@ -145,6 +139,7 @@ typedef struct { | |||
145 | 139 | ||
146 | char *local_command; | 140 | char *local_command; |
147 | int permit_local_command; | 141 | int permit_local_command; |
142 | char *remote_command; | ||
148 | int visual_host_key; | 143 | int visual_host_key; |
149 | 144 | ||
150 | int request_tty; | 145 | int request_tty; |
@@ -200,6 +195,11 @@ typedef struct { | |||
200 | #define SSH_UPDATE_HOSTKEYS_YES 1 | 195 | #define SSH_UPDATE_HOSTKEYS_YES 1 |
201 | #define SSH_UPDATE_HOSTKEYS_ASK 2 | 196 | #define SSH_UPDATE_HOSTKEYS_ASK 2 |
202 | 197 | ||
198 | #define SSH_STRICT_HOSTKEY_OFF 0 | ||
199 | #define SSH_STRICT_HOSTKEY_NEW 1 | ||
200 | #define SSH_STRICT_HOSTKEY_YES 2 | ||
201 | #define SSH_STRICT_HOSTKEY_ASK 3 | ||
202 | |||
203 | void initialize_options(Options *); | 203 | void initialize_options(Options *); |
204 | void fill_default_options(Options *); | 204 | void fill_default_options(Options *); |
205 | void fill_default_options_for_canonicalization(Options *); | 205 | void fill_default_options_for_canonicalization(Options *); |