From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 15 Jul 2020 05:30:43 +0000 (+1000)
Subject: Adjust portable code to match changes in 939d787d,
X-Git-Tag: V_8_4_P1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7e71be4fd57b7c7e620d733cdf2333b27bfa924;p=thirdparty%2Fopenssh-portable.git

Adjust portable code to match changes in 939d787d,
---

diff --git a/session.c b/session.c
index 3f7488cde..27ca8a104 100644
--- 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