RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Darren Tucker 2018-07-05 13:32:01 +10:00
parent 314908f451
commit 3deb56f719
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session.c
View File

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