summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2020-07-15 15:30:43 +1000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:30:43 +1000
commitd7e71be4fd57b7c7e620d733cdf2333b27bfa924 (patch)
tree4b1a89d93fd333dfd1abc3b94deb9a6b209c7c93
parentfec89f32a84fd0aa1afc81deec80a460cbaf451a (diff)
Adjust portable code to match changes in 939d787d,
-rw-r--r--session.c4
1 files changed, 2 insertions, 2 deletions
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)
924 * interested in. 924 * interested in.
925 */ 925 */
926 read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login", 926 read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login",
927 options.permit_user_env_whitelist); 927 options.permit_user_env_allowlist);
928 928
929 if (tmpenv == NULL) 929 if (tmpenv == NULL)
930 return; 930 return;
@@ -1091,7 +1091,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
1091 if ((cp = getenv("AUTHSTATE")) != NULL) 1091 if ((cp = getenv("AUTHSTATE")) != NULL)
1092 child_set_env(&env, &envsize, "AUTHSTATE", cp); 1092 child_set_env(&env, &envsize, "AUTHSTATE", cp);
1093 read_environment_file(&env, &envsize, "/etc/environment", 1093 read_environment_file(&env, &envsize, "/etc/environment",
1094 options.permit_user_env_whitelist); 1094 options.permit_user_env_allowlist);
1095 } 1095 }
1096#endif 1096#endif
1097#ifdef KRB5 1097#ifdef KRB5