From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Mar 2019 09:54:11 +0000 (+0100)
Subject: user-util: simplify paths retrieved from $HOME and $SHELL
X-Git-Tag: v242-rc1~155^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db246781a0ea28eb63137bb58486b1419e50d6f8;p=thirdparty%2Fsystemd.git

user-util: simplify paths retrieved from $HOME and $SHELL

Let's add some extra paranoia, after #11910
---

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 47d6763f1c9..5f1bd5f5a20 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -463,7 +463,7 @@ int get_home_dir(char **_h) {
                 if (!h)
                         return -ENOMEM;
 
-                *_h = h;
+                *_h = path_simplify(h, true);
                 return 0;
         }
 
@@ -501,7 +501,7 @@ int get_home_dir(char **_h) {
         if (!h)
                 return -ENOMEM;
 
-        *_h = h;
+        *_h = path_simplify(h, true);
         return 0;
 }
 
@@ -520,7 +520,7 @@ int get_shell(char **_s) {
                 if (!s)
                         return -ENOMEM;
 
-                *_s = s;
+                *_s = path_simplify(s, true);
                 return 0;
         }
 
@@ -558,7 +558,7 @@ int get_shell(char **_s) {
         if (!s)
                 return -ENOMEM;
 
-        *_s = s;
+        *_s = path_simplify(s, true);
         return 0;
 }