upstream: some language improvements; ok markus

OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8

1 files changed, 11 insertions, 11 deletions

diff --git a/servconf.c b/servconf.c
index 22cb9583f..67581ccf2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.366 2020/06/24 15:09:53 markus Exp $ */
+/* $OpenBSD: servconf.c,v 1.367 2020/07/05 23:59:45 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -141,7 +141,7 @@ initialize_server_options(ServerOptions *options)
         options->challenge_response_authentication = -1;
         options->permit_empty_passwd = -1;
         options->permit_user_env = -1;
-        options->permit_user_env_whitelist = NULL;
+        options->permit_user_env_allowlist = NULL;
         options->compression = -1;
         options->rekey_limit = -1;
         options->rekey_interval = -1;
@@ -213,11 +213,11 @@ assemble_algorithms(ServerOptions *o)
         all_key = sshkey_alg_list(0, 0, 1, ',');
         all_sig = sshkey_alg_list(0, 1, 1, ',');
         /* remove unsupported algos from default lists */
-        def_cipher = match_filter_whitelist(KEX_SERVER_ENCRYPT, all_cipher);
-        def_mac = match_filter_whitelist(KEX_SERVER_MAC, all_mac);
-        def_kex = match_filter_whitelist(KEX_SERVER_KEX, all_kex);
-        def_key = match_filter_whitelist(KEX_DEFAULT_PK_ALG, all_key);
-        def_sig = match_filter_whitelist(SSH_ALLOWED_CA_SIGALGS, all_sig);
+        def_cipher = match_filter_allowlist(KEX_SERVER_ENCRYPT, all_cipher);
+        def_mac = match_filter_allowlist(KEX_SERVER_MAC, all_mac);
+        def_kex = match_filter_allowlist(KEX_SERVER_KEX, all_kex);
+        def_key = match_filter_allowlist(KEX_DEFAULT_PK_ALG, all_key);
+        def_sig = match_filter_allowlist(SSH_ALLOWED_CA_SIGALGS, all_sig);
 #define ASSEMBLE(what, defaults, all) \
         do { \
                 if ((r = kex_assemble_names(&o->what, defaults, all)) != 0) \
@@ -390,7 +390,7 @@ fill_default_server_options(ServerOptions *options)
                 options->permit_empty_passwd = 0;
         if (options->permit_user_env == -1) {
                 options->permit_user_env = 0;
-                options->permit_user_env_whitelist = NULL;
+                options->permit_user_env_allowlist = NULL;
         }
         if (options->compression == -1)
 #ifdef WITH_ZLIB
@@ -1630,7 +1630,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 
         case sPermitUserEnvironment:
                 intptr = &options->permit_user_env;
-                charptr = &options->permit_user_env_whitelist;
+                charptr = &options->permit_user_env_allowlist;
                 arg = strdelim(&cp);
                 if (!arg || *arg == '\0')
                         fatal("%s line %d: missing argument.",
@@ -2925,11 +2925,11 @@ dump_config(ServerOptions *o)
         }
         printf("\n");
 
-        if (o->permit_user_env_whitelist == NULL) {
+        if (o->permit_user_env_allowlist == NULL) {
                 dump_cfg_fmtint(sPermitUserEnvironment, o->permit_user_env);
         } else {
                 printf("permituserenvironment %s\n",
-                    o->permit_user_env_whitelist);
+                    o->permit_user_env_allowlist);
         }
 
         printf("pubkeyauthoptions");