From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 12 Aug 2023 06:25:03 +0000 (+0900)
Subject: core: set $CREDENTIALS_DIRECTORY only when we set up credentials
X-Git-Tag: v255-rc1~669^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbaf3b23ae4aa79110ebd37aada70ce6a044c692;p=thirdparty%2Fsystemd.git

core: set $CREDENTIALS_DIRECTORY only when we set up credentials

It is not necessary to set the environment variable on an execution step
we do not support credentials.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 14e196d4c7a..78d8988e8b1 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2041,7 +2041,9 @@ static int build_environment(
                 our_env[n_env++] = x;
         }
 
-        if (exec_context_has_credentials(c) && p->prefix[EXEC_DIRECTORY_RUNTIME]) {
+        if (exec_context_has_credentials(c) &&
+            p->prefix[EXEC_DIRECTORY_RUNTIME] &&
+            FLAGS_SET(p->flags, EXEC_WRITE_CREDENTIALS)) {
                 x = strjoin("CREDENTIALS_DIRECTORY=", p->prefix[EXEC_DIRECTORY_RUNTIME], "/credentials/", u->id);
                 if (!x)
                         return -ENOMEM;