summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
commit62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch)
tree3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /readconf.h
parent6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff)
parent66bf74a92131b7effe49fb0eefe5225151869dc5 (diff)
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/readconf.h b/readconf.h
index cef55f71c..22fe5c187 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;
@@ -54,11 +51,10 @@ typedef struct {
54 int check_host_ip; /* Also keep track of keys for IP address */ 51 int check_host_ip; /* Also keep track of keys for IP address */
55 int strict_host_key_checking; /* Strict host key checking. */ 52 int strict_host_key_checking; /* Strict host key checking. */
56 int compression; /* Compress packets in both directions. */ 53 int compression; /* Compress packets in both directions. */
57 int compression_level; /* Compression level 1 (fast) to 9
58 * (best). */
59 int tcp_keep_alive; /* Set SO_KEEPALIVE. */ 54 int tcp_keep_alive; /* Set SO_KEEPALIVE. */
60 int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ 55 int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */
61 int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ 56 int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */
57 SyslogFacility log_facility; /* Facility for system logging. */
62 LogLevel log_level; /* Level for logging. */ 58 LogLevel log_level; /* Level for logging. */
63 59
64 int port; /* Port to connect. */ 60 int port; /* Port to connect. */
@@ -69,12 +65,10 @@ typedef struct {
69 * aborting connection attempt */ 65 * aborting connection attempt */
70 int number_of_password_prompts; /* Max number of password 66 int number_of_password_prompts; /* Max number of password
71 * prompts. */ 67 * prompts. */
72 int cipher; /* Cipher to use. */
73 char *ciphers; /* SSH2 ciphers in order of preference. */ 68 char *ciphers; /* SSH2 ciphers in order of preference. */
74 char *macs; /* SSH2 macs in order of preference. */ 69 char *macs; /* SSH2 macs in order of preference. */
75 char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ 70 char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */
76 char *kex_algorithms; /* SSH2 kex methods in order of preference. */ 71 char *kex_algorithms; /* SSH2 kex methods in order of preference. */
77 int protocol; /* Protocol in order of preference. */
78 char *hostname; /* Real host to connect. */ 72 char *hostname; /* Real host to connect. */
79 char *host_key_alias; /* hostname alias for .ssh/known_hosts */ 73 char *host_key_alias; /* hostname alias for .ssh/known_hosts */
80 char *proxy_command; /* Proxy command for connecting the host. */ 74 char *proxy_command; /* Proxy command for connecting the host. */
@@ -140,6 +134,7 @@ typedef struct {
140 134
141 char *local_command; 135 char *local_command;
142 int permit_local_command; 136 int permit_local_command;
137 char *remote_command;
143 int visual_host_key; 138 int visual_host_key;
144 139
145 int request_tty; 140 int request_tty;
@@ -195,6 +190,11 @@ typedef struct {
195#define SSH_UPDATE_HOSTKEYS_YES 1 190#define SSH_UPDATE_HOSTKEYS_YES 1
196#define SSH_UPDATE_HOSTKEYS_ASK 2 191#define SSH_UPDATE_HOSTKEYS_ASK 2
197 192
193#define SSH_STRICT_HOSTKEY_OFF 0
194#define SSH_STRICT_HOSTKEY_NEW 1
195#define SSH_STRICT_HOSTKEY_YES 2
196#define SSH_STRICT_HOSTKEY_ASK 3
197
198void initialize_options(Options *); 198void initialize_options(Options *);
199void fill_default_options(Options *); 199void fill_default_options(Options *);
200void fill_default_options_for_canonicalization(Options *); 200void fill_default_options_for_canonicalization(Options *);