From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Jul 2020 06:48:56 +0000 (+0200)
Subject: core: clean more env vars from env block pid1 receives
X-Git-Tag: v246-rc2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8047ac8fdcc7a922834837f7df122b6e36df6e4b;p=thirdparty%2Fsystemd.git

core: clean more env vars from env block pid1 receives

We generally clean all env vars we use ourselves to communicate with out
childrens. We forgot some more recent additions however. Let's correct
that.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 54c6321870f..41e0d737366 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -589,6 +589,8 @@ static char** sanitize_environment(char **l) {
         /* Let's remove some environment variables that we need ourselves to communicate with our clients */
         strv_env_unset_many(
                         l,
+                        "CACHE_DIRECTORY",
+                        "CONFIGURATION_DIRECTORY",
                         "EXIT_CODE",
                         "EXIT_STATUS",
                         "INVOCATION_ID",
@@ -596,13 +598,16 @@ static char** sanitize_environment(char **l) {
                         "LISTEN_FDNAMES",
                         "LISTEN_FDS",
                         "LISTEN_PID",
+                        "LOGS_DIRECTORY",
                         "MAINPID",
                         "MANAGERPID",
                         "NOTIFY_SOCKET",
                         "PIDFILE",
                         "REMOTE_ADDR",
                         "REMOTE_PORT",
+                        "RUNTIME_DIRECTORY",
                         "SERVICE_RESULT",
+                        "STATE_DIRECTORY",
                         "WATCHDOG_PID",
                         "WATCHDOG_USEC",
                         NULL);