diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:18:22 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 10:05:00 +1000 |
commit | 788ac799a6efa40517f2ac0d895a610394298ffc (patch) | |
tree | 29e320f7adeb31b2febfa08cc60b6c578263dfc6 /readconf.h | |
parent | e6882463a8ae0594aacb6d6575a6318a41973d84 (diff) |
upstream commit
remove SSHv1 configuration options and man pages bits
ok markus@
Upstream-ID: 84638c23546c056727b7a7d653c72574e0f19424
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h index c2ffd9ed4..f47f53402 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.120 2017/04/30 23:15:04 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.121 2017/04/30 23:18:22 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,8 +51,6 @@ 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 */ |