summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-01-26 05:32:21 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-01-26 22:50:40 +1100
commite9f78d6b06fc323bba1890b2dc3b8423138fb35c (patch)
tree095318e0ad5c19277a07809cf0cf1d2c1c5facf1 /servconf.h
parent48d0d7a4dd31154c4208ec39029d60646192f978 (diff)
downloadopenssh-git-e9f78d6b06fc323bba1890b2dc3b8423138fb35c.tar.gz
upstream: Rename HostbasedKeyTypes (ssh) and
HostbasedAcceptedKeyTypes (sshd) to HostbasedAcceptedAlgorithms, which more accurately reflects its effect. This matches a previous change to PubkeyAcceptedAlgorithms. The previous names are retained as aliases. ok djm@ OpenBSD-Commit-ID: 49451c382adc6e69d3fa0e0663eeef2daa4b199e
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.h b/servconf.h
index 364cd947..4f4fd9ba 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.150 2021/01/22 02:44:58 dtucker Exp $ */
+/* $OpenBSD: servconf.h,v 1.151 2021/01/26 05:32:21 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -122,7 +122,7 @@ typedef struct {
char **log_verbose;
int hostbased_authentication; /* If true, permit ssh2 hostbased auth */
int hostbased_uses_name_from_packet_only; /* experimental */
- char *hostbased_key_types; /* Key types allowed for hostbased */
+ char *hostbased_accepted_algos; /* Algos allowed for hostbased */
char *hostkeyalgorithms; /* SSH2 server key types */
char *ca_sign_algorithms; /* Allowed CA signature algorithms */
int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
@@ -271,7 +271,7 @@ TAILQ_HEAD(include_list, include_item);
M_CP_STROPT(authorized_principals_file); \
M_CP_STROPT(authorized_principals_command); \
M_CP_STROPT(authorized_principals_command_user); \
- M_CP_STROPT(hostbased_key_types); \
+ M_CP_STROPT(hostbased_accepted_algos); \
M_CP_STROPT(pubkey_accepted_algos); \
M_CP_STROPT(ca_sign_algorithms); \
M_CP_STROPT(routing_domain); \