]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
service: let's set EXEC_NEW_KEYRING through SET_FLAG()
authorLennart Poettering <lennart@poettering.net>
Tue, 1 Aug 2017 08:37:17 +0000 (10:37 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 10 Aug 2017 13:02:49 +0000 (15:02 +0200)
Not that it really matters, but it matches how we set the flags in
manager_set_exec_params() too.

src/core/service.c

index 4510ac2423fdf54b60d1576c4c67c46a005a5690..04ec3ac90eba9629adacb7f0e9603189bc5997d0 100644 (file)
@@ -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;