tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust portable code to match changes in 939d787d,

Browse Source
This commit is contained in:
Darren Tucker 2020-07-15 15:30:43 +10:00
parent fec89f32a8
commit d7e71be4fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
session.c
View File

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