From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Mar 2019 10:00:13 +0000 (+0100)
Subject: execute: simplify paths we set as HOME/SHELL for invoked programs
X-Git-Tag: v242-rc1~155^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bbead1d0b8339d9878f8c9debf4d0966f442b9e;p=thirdparty%2Fsystemd.git

execute: simplify paths we set as HOME/SHELL for invoked programs
---

diff --git a/src/core/execute.c b/src/core/execute.c
index c6fd82bbf3e..d74affebb3d 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1697,6 +1697,8 @@ static int build_environment(
                 x = strappend("HOME=", home);
                 if (!x)
                         return -ENOMEM;
+
+                path_simplify(x + 5, true);
                 our_env[n_env++] = x;
         }
 
@@ -1716,6 +1718,8 @@ static int build_environment(
                 x = strappend("SHELL=", shell);
                 if (!x)
                         return -ENOMEM;
+
+                path_simplify(x + 6, true);
                 our_env[n_env++] = x;
         }