From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Nov 2018 18:14:24 +0000 (+0100)
Subject: core: run env generators with non-zero umask
X-Git-Tag: v240~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3b8d0637dd755b3426f3363b2cdad63f738116c;p=thirdparty%2Fsystemd.git

core: run env generators with non-zero umask

For PID 1 we adjust the umask to 0, but generators should not run that
way, given that they might be implemented as shell scripts and such.
Let's hence explicitly adjust the umask for them.

We already do this for unit generators. Let's do this for env
generators, too.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index f4fdd91c2c4..e2de1c84b91 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3813,6 +3813,7 @@ static int manager_run_environment_generators(Manager *m) {
                 [STDOUT_COLLECT] = &tmp,
                 [STDOUT_CONSUME] = &m->transient_environment,
         };
+        int r;
 
         if (MANAGER_IS_TEST_RUN(m) && !(m->test_run_flags & MANAGER_TEST_RUN_ENV_GENERATORS))
                 return 0;
@@ -3822,7 +3823,10 @@ static int manager_run_environment_generators(Manager *m) {
         if (!generator_path_any(paths))
                 return 0;
 
-        return execute_directories(paths, DEFAULT_TIMEOUT_USEC, gather_environment, args, NULL, m->transient_environment);
+        RUN_WITH_UMASK(0022)
+                r = execute_directories(paths, DEFAULT_TIMEOUT_USEC, gather_environment, args, NULL, m->transient_environment);
+
+        return r;
 }
 
 static int manager_run_generators(Manager *m) {