From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Aug 2017 08:37:17 +0000 (+0200)
Subject: service: let's set EXEC_NEW_KEYRING through SET_FLAG()
X-Git-Tag: v235~237^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bf7569cf885b0af940f5c3945b3f7cb13bd666f;p=thirdparty%2Fsystemd.git

service: let's set EXEC_NEW_KEYRING through SET_FLAG()

Not that it really matters, but it matches how we set the flags in
manager_set_exec_params() too.
---

diff --git a/src/core/service.c b/src/core/service.c
index 4510ac2423f..04ec3ac90eb 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1358,7 +1358,8 @@ static int service_spawn(
         } else
                 path = UNIT(s)->cgroup_path;
 
-        exec_params.flags |= MANAGER_IS_SYSTEM(UNIT(s)->manager) ? EXEC_NEW_KEYRING : 0;
+        /* System services should get a new keyring by default. */
+        SET_FLAG(exec_params.flags, EXEC_NEW_KEYRING, MANAGER_IS_SYSTEM(UNIT(s)->manager));
         exec_params.argv = c->argv;
         exec_params.environment = final_env;
         exec_params.fds = fds;