diff options
-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) | |||
947 | * so we use a temporary environment and copy the variables we're | 947 | * so we use a temporary environment and copy the variables we're |
948 | * interested in. | 948 | * interested in. |
949 | */ | 949 | */ |
950 | read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login"); | 950 | read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login", |
951 | options.permit_user_env_whitelist); | ||
951 | 952 | ||
952 | if (tmpenv == NULL) | 953 | if (tmpenv == NULL) |
953 | return; | 954 | return; |
@@ -1106,7 +1107,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) | |||
1106 | 1107 | ||
1107 | if ((cp = getenv("AUTHSTATE")) != NULL) | 1108 | if ((cp = getenv("AUTHSTATE")) != NULL) |
1108 | child_set_env(&env, &envsize, "AUTHSTATE", cp); | 1109 | child_set_env(&env, &envsize, "AUTHSTATE", cp); |
1109 | read_environment_file(&env, &envsize, "/etc/environment"); | 1110 | read_environment_file(&env, &envsize, "/etc/environment", |
1111 | options.permit_user_env_whitelist); | ||
1110 | } | 1112 | } |
1111 | #endif | 1113 | #endif |
1112 | #ifdef KRB5 | 1114 | #ifdef KRB5 |