diff options
author | Colin Watson <cjwatson@debian.org> | 2018-10-19 21:29:01 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-10-20 22:54:15 +0100 |
commit | d80ebbf028196b2478beebf5a290b97f35e1eed9 (patch) | |
tree | 6666a5484923a26738675ff27a6186cfe15d4cad /servconf.h | |
parent | 4f5bbf3f11efeec65bbd56464b20a19bd250e5cc (diff) | |
parent | 1d2a55436d4b556269f42ad5f7e16608b5a8ed74 (diff) |
New upstream release (7.9p1)
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 76098119b..4e3c54042 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.136 2018/07/09 21:26:02 markus Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.137 2018/09/20 03:28:06 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -110,6 +110,7 @@ typedef struct { | |||
110 | int hostbased_uses_name_from_packet_only; /* experimental */ | 110 | int hostbased_uses_name_from_packet_only; /* experimental */ |
111 | char *hostbased_key_types; /* Key types allowed for hostbased */ | 111 | char *hostbased_key_types; /* Key types allowed for hostbased */ |
112 | char *hostkeyalgorithms; /* SSH2 server key types */ | 112 | char *hostkeyalgorithms; /* SSH2 server key types */ |
113 | char *ca_sign_algorithms; /* Allowed CA signature algorithms */ | ||
113 | int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ | 114 | int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ |
114 | char *pubkey_key_types; /* Key types allowed for public key */ | 115 | char *pubkey_key_types; /* Key types allowed for public key */ |
115 | int kerberos_authentication; /* If true, permit Kerberos | 116 | int kerberos_authentication; /* If true, permit Kerberos |
@@ -246,6 +247,7 @@ struct connection_info { | |||
246 | M_CP_STROPT(authorized_principals_command_user); \ | 247 | M_CP_STROPT(authorized_principals_command_user); \ |
247 | M_CP_STROPT(hostbased_key_types); \ | 248 | M_CP_STROPT(hostbased_key_types); \ |
248 | M_CP_STROPT(pubkey_key_types); \ | 249 | M_CP_STROPT(pubkey_key_types); \ |
250 | M_CP_STROPT(ca_sign_algorithms); \ | ||
249 | M_CP_STROPT(routing_domain); \ | 251 | M_CP_STROPT(routing_domain); \ |
250 | M_CP_STROPT(permit_user_env_whitelist); \ | 252 | M_CP_STROPT(permit_user_env_whitelist); \ |
251 | M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ | 253 | M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ |