]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Adjust portable code to match changes in 939d787d,
authorDarren Tucker <dtucker@dtucker.net>
Wed, 15 Jul 2020 05:30:43 +0000 (15:30 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 15 Jul 2020 05:30:43 +0000 (15:30 +1000)
session.c

index 3f7488cded37420546f08af2b5109f56cf720cb6..27ca8a104dd69054c02eaac1c54cf572781f4c95 100644 (file)
--- a/session.c
+++ b/session.c
@@ -924,7 +924,7 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
         * interested in.
         */
        read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login",
-           options.permit_user_env_whitelist);
+           options.permit_user_env_allowlist);
 
        if (tmpenv == NULL)
                return;
@@ -1091,7 +1091,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
                if ((cp = getenv("AUTHSTATE")) != NULL)
                        child_set_env(&env, &envsize, "AUTHSTATE", cp);
                read_environment_file(&env, &envsize, "/etc/environment",
-                   options.permit_user_env_whitelist);
+                   options.permit_user_env_allowlist);
        }
 #endif
 #ifdef KRB5