Adjust portable code to match changes in 939d787d,

This commit is contained in:
Darren Tucker 2020-07-15 15:30:43 +10:00
parent fec89f32a8
commit d7e71be4fd

View File

@ -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