From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Thu, 7 Jul 2016 10:36:33 +0000 (+0200)
Subject: execute: Cleanup the environment early
X-Git-Tag: v231~77^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1280503b7e74cacfa091f7e270a89c5811388c2b;p=thirdparty%2Fsystemd.git

execute: Cleanup the environment early

By cleaning up before setting up PAM we maintain control of overriding
behavior in setting variables. Otherwise, pam_putenv is in control.
This also makes sure we use a cleaned up environment in replacing
variables in argv.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 8cb18dbd5b5..1a7620b0848 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -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;