summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 49b228bdf..9922f0c8c 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.115 2014/12/21 22:27:56 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.116 2015/01/13 07:39:19 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -99,8 +99,10 @@ typedef struct {
99 * authentication. */ 99 * authentication. */
100 int hostbased_authentication; /* If true, permit ssh2 hostbased auth */ 100 int hostbased_authentication; /* If true, permit ssh2 hostbased auth */
101 int hostbased_uses_name_from_packet_only; /* experimental */ 101 int hostbased_uses_name_from_packet_only; /* experimental */
102 char *hostbased_key_types; /* Key types allowed for hostbased */
102 int rsa_authentication; /* If true, permit RSA authentication. */ 103 int rsa_authentication; /* If true, permit RSA authentication. */
103 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ 104 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
105 char *pubkey_key_types; /* Key types allowed for public key */
104 int kerberos_authentication; /* If true, permit Kerberos 106 int kerberos_authentication; /* If true, permit Kerberos
105 * authentication. */ 107 * authentication. */
106 int kerberos_or_local_passwd; /* If true, permit kerberos 108 int kerberos_or_local_passwd; /* If true, permit kerberos
@@ -215,6 +217,8 @@ struct connection_info {
215 M_CP_STROPT(authorized_principals_file); \ 217 M_CP_STROPT(authorized_principals_file); \
216 M_CP_STROPT(authorized_keys_command); \ 218 M_CP_STROPT(authorized_keys_command); \
217 M_CP_STROPT(authorized_keys_command_user); \ 219 M_CP_STROPT(authorized_keys_command_user); \
220 M_CP_STROPT(hostbased_key_types); \
221 M_CP_STROPT(pubkey_key_types); \
218 M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ 222 M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \
219 M_CP_STRARRAYOPT(allow_users, num_allow_users); \ 223 M_CP_STRARRAYOPT(allow_users, num_allow_users); \
220 M_CP_STRARRAYOPT(deny_users, num_deny_users); \ 224 M_CP_STRARRAYOPT(deny_users, num_deny_users); \