]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: clean more env vars from env block pid1 receives
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2020 06:48:56 +0000 (08:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2020 16:30:15 +0000 (18:30 +0200)
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.

src/core/manager.c

index 54c6321870f66edac683e6bab1aa19ee304e967e..41e0d73736627cd70bcfd165019416da349f0740 100644 (file)
@@ -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);