diff options
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servconf.h b/servconf.h index a420f398d..8422f3f51 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.144 2020/04/17 03:30:05 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.145 2020/07/05 23:59:45 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -146,7 +146,7 @@ typedef struct { | |||
146 | int permit_empty_passwd; /* If false, do not permit empty | 146 | int permit_empty_passwd; /* If false, do not permit empty |
147 | * passwords. */ | 147 | * passwords. */ |
148 | int permit_user_env; /* If true, read ~/.ssh/environment */ | 148 | int permit_user_env; /* If true, read ~/.ssh/environment */ |
149 | char *permit_user_env_whitelist; /* pattern-list whitelist */ | 149 | char *permit_user_env_allowlist; /* pattern-list of allowed env names */ |
150 | int compression; /* If true, compression is allowed */ | 150 | int compression; /* If true, compression is allowed */ |
151 | int allow_tcp_forwarding; /* One of FORWARD_* */ | 151 | int allow_tcp_forwarding; /* One of FORWARD_* */ |
152 | int allow_streamlocal_forwarding; /* One of FORWARD_* */ | 152 | int allow_streamlocal_forwarding; /* One of FORWARD_* */ |
@@ -250,7 +250,7 @@ TAILQ_HEAD(include_list, include_item); | |||
250 | /* | 250 | /* |
251 | * These are string config options that must be copied between the | 251 | * These are string config options that must be copied between the |
252 | * Match sub-config and the main config, and must be sent from the | 252 | * Match sub-config and the main config, and must be sent from the |
253 | * privsep slave to the privsep master. We use a macro to ensure all | 253 | * privsep child to the privsep master. We use a macro to ensure all |
254 | * the options are copied and the copies are done in the correct order. | 254 | * the options are copied and the copies are done in the correct order. |
255 | * | 255 | * |
256 | * NB. an option must appear in servconf.c:copy_set_server_options() or | 256 | * NB. an option must appear in servconf.c:copy_set_server_options() or |
@@ -269,7 +269,7 @@ TAILQ_HEAD(include_list, include_item); | |||
269 | M_CP_STROPT(pubkey_key_types); \ | 269 | M_CP_STROPT(pubkey_key_types); \ |
270 | M_CP_STROPT(ca_sign_algorithms); \ | 270 | M_CP_STROPT(ca_sign_algorithms); \ |
271 | M_CP_STROPT(routing_domain); \ | 271 | M_CP_STROPT(routing_domain); \ |
272 | M_CP_STROPT(permit_user_env_whitelist); \ | 272 | M_CP_STROPT(permit_user_env_allowlist); \ |
273 | M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ | 273 | M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ |
274 | M_CP_STRARRAYOPT(allow_users, num_allow_users); \ | 274 | M_CP_STRARRAYOPT(allow_users, num_allow_users); \ |
275 | M_CP_STRARRAYOPT(deny_users, num_deny_users); \ | 275 | M_CP_STRARRAYOPT(deny_users, num_deny_users); \ |