shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

Merge pull request #3680 from joukewitteveen/pam-env

Browse Source 
Follow up on #3503 (pass service env vars to PAM sessions)
This commit is contained in:
Evgeny Vereshchagin 2016-07-08 17:33:12 +03:00 committed by GitHub
commit 224d3d8266
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/execute.c
View File

@ -835,7 +835,7 @@ static int setup_pam(
pam_handle_t *handle = NULL;
sigset_t old_ss;
int pam_code = PAM_SUCCESS, r;
char **e = NULL;
char **nv, **e = NULL;
bool close_session = false;
pid_t pam_pid = 0, parent_pid;
int flags = 0;
@ -870,8 +870,8 @@ static int setup_pam(
goto fail;
}
STRV_FOREACH(e, *env) {
pam_code = pam_putenv(handle, *e);
STRV_FOREACH(nv, *env) {
pam_code = pam_putenv(handle, *nv);
if (pam_code != PAM_SUCCESS)
goto fail;
}
@ -1858,6 +1858,7 @@ static int exec_child(
*exit_status = EXIT_MEMORY;
return -ENOMEM;
}
accum_env = strv_env_clean(accum_env);
umask(context->umask);
@ -2166,8 +2167,6 @@ static int exec_child(
return -ENOMEM;
}
accum_env = strv_env_clean(accum_env);
if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
_cleanup_free_ char *line;