diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2018-07-05 05:32:01 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2018-07-05 05:32:01 +0200 |
| commit | 3deb56f7190a414dc264e21e087a934fa1847283 (patch) | |
| tree | 27f6a467dadaf8c9c64b9d26d3d046fb396a8199 /session.c | |
| parent | upstream: deal with API rename: match_filter_list() => (diff) | |
| download | openssh-3deb56f7190a414dc264e21e087a934fa1847283.tar.xz openssh-3deb56f7190a414dc264e21e087a934fa1847283.zip | |
Fix other callers of read_environment_file.
read_environment_file recently gained an extra argument Some platform
specific code also calls it so add the argument to those too. Fixes
build on Solaris and AIX.
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -947,7 +947,8 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid) * so we use a temporary environment and copy the variables we're * interested in. */ - read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login"); + read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login", + options.permit_user_env_whitelist); if (tmpenv == NULL) return; @@ -1106,7 +1107,8 @@ 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"); + read_environment_file(&env, &envsize, "/etc/environment", + options.permit_user_env_whitelist); } #endif #ifdef KRB5 |