summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/servconf.h b/servconf.h
index f4137af7d..5853a9747 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.120 2015/07/10 06:21:53 markus Exp $ */ 1/* $OpenBSD: servconf.h,v 1.123 2016/11/30 03:00:05 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -69,10 +69,8 @@ typedef struct {
69 int num_host_cert_files; /* Number of files for host certs. */ 69 int num_host_cert_files; /* Number of files for host certs. */
70 char *host_key_agent; /* ssh-agent socket for host keys. */ 70 char *host_key_agent; /* ssh-agent socket for host keys. */
71 char *pid_file; /* Where to put our pid */ 71 char *pid_file; /* Where to put our pid */
72 int server_key_bits;/* Size of the server key. */
73 int login_grace_time; /* Disconnect if no auth in this time 72 int login_grace_time; /* Disconnect if no auth in this time
74 * (sec). */ 73 * (sec). */
75 int key_regeneration_time; /* Server key lifetime (seconds). */
76 int permit_root_login; /* PERMIT_*, see above */ 74 int permit_root_login; /* PERMIT_*, see above */
77 int ignore_rhosts; /* Ignore .rhosts and .shosts. */ 75 int ignore_rhosts; /* Ignore .rhosts and .shosts. */
78 int ignore_user_known_hosts; /* Ignore ~/.ssh/known_hosts 76 int ignore_user_known_hosts; /* Ignore ~/.ssh/known_hosts
@@ -93,17 +91,13 @@ typedef struct {
93 char *ciphers; /* Supported SSH2 ciphers. */ 91 char *ciphers; /* Supported SSH2 ciphers. */
94 char *macs; /* Supported SSH2 macs. */ 92 char *macs; /* Supported SSH2 macs. */
95 char *kex_algorithms; /* SSH2 kex methods in order of preference. */ 93 char *kex_algorithms; /* SSH2 kex methods in order of preference. */
96 int protocol; /* Supported protocol versions. */
97 struct ForwardOptions fwd_opts; /* forwarding options */ 94 struct ForwardOptions fwd_opts; /* forwarding options */
98 SyslogFacility log_facility; /* Facility for system logging. */ 95 SyslogFacility log_facility; /* Facility for system logging. */
99 LogLevel log_level; /* Level for system logging. */ 96 LogLevel log_level; /* Level for system logging. */
100 int rhosts_rsa_authentication; /* If true, permit rhosts RSA
101 * authentication. */
102 int hostbased_authentication; /* If true, permit ssh2 hostbased auth */ 97 int hostbased_authentication; /* If true, permit ssh2 hostbased auth */
103 int hostbased_uses_name_from_packet_only; /* experimental */ 98 int hostbased_uses_name_from_packet_only; /* experimental */
104 char *hostbased_key_types; /* Key types allowed for hostbased */ 99 char *hostbased_key_types; /* Key types allowed for hostbased */
105 char *hostkeyalgorithms; /* SSH2 server key types */ 100 char *hostkeyalgorithms; /* SSH2 server key types */
106 int rsa_authentication; /* If true, permit RSA authentication. */
107 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ 101 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
108 char *pubkey_key_types; /* Key types allowed for public key */ 102 char *pubkey_key_types; /* Key types allowed for public key */
109 int kerberos_authentication; /* If true, permit Kerberos 103 int kerberos_authentication; /* If true, permit Kerberos
@@ -127,11 +121,11 @@ typedef struct {
127 int permit_empty_passwd; /* If false, do not permit empty 121 int permit_empty_passwd; /* If false, do not permit empty
128 * passwords. */ 122 * passwords. */
129 int permit_user_env; /* If true, read ~/.ssh/environment */ 123 int permit_user_env; /* If true, read ~/.ssh/environment */
130 int use_login; /* If true, login(1) is used */
131 int compression; /* If true, compression is allowed */ 124 int compression; /* If true, compression is allowed */
132 int allow_tcp_forwarding; /* One of FORWARD_* */ 125 int allow_tcp_forwarding; /* One of FORWARD_* */
133 int allow_streamlocal_forwarding; /* One of FORWARD_* */ 126 int allow_streamlocal_forwarding; /* One of FORWARD_* */
134 int allow_agent_forwarding; 127 int allow_agent_forwarding;
128 int disable_forwarding;
135 u_int num_allow_users; 129 u_int num_allow_users;
136 char *allow_users[MAX_ALLOW_USERS]; 130 char *allow_users[MAX_ALLOW_USERS];
137 u_int num_deny_users; 131 u_int num_deny_users;