X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=95fc7e64acb467b334645c976ff1a0287c804104;hb=1f6d9bc9ee894d4023b7eacea1754986f25bce57;hp=1eda2b1c5ddcd38ac775ebcb0ae8227a99747a68;hpb=a2cc4a6c960c26f62c33c995bc648357d939bd68;p=elogind.git

diff --git a/src/core/manager.c b/src/core/manager.c
index 1eda2b1c5..95fc7e64a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -332,6 +332,23 @@ static int manager_setup_signals(Manager *m) {
         return 0;
 }
 
+static void manager_clean_environment(Manager *m) {
+        assert(m);
+
+        /* Let's remove some environment variables that we
+         * need ourselves to communicate with our clients */
+        strv_env_unset_many(
+                        m->environment,
+                        "NOTIFY_SOCKET",
+                        "MAINPID",
+                        "MANAGERPID",
+                        "LISTEN_PID",
+                        "LISTEN_FDS",
+                        "WATCHDOG_PID",
+                        "WATCHDOG_USEC",
+                        NULL);
+}
+
 static int manager_default_environment(Manager *m) {
         assert(m);
 
@@ -348,14 +365,16 @@ static int manager_default_environment(Manager *m) {
 
                 /* Import locale variables LC_*= from configuration */
                 locale_setup(&m->environment);
-        } else
+        } else {
                 /* The user manager passes its own environment
                  * along to its children. */
                 m->environment = strv_copy(environ);
+        }
 
         if (!m->environment)
                 return -ENOMEM;
 
+        manager_clean_environment(m);
         strv_sort(m->environment);
 
         return 0;
@@ -530,11 +549,13 @@ static int manager_setup_notify(Manager *m) {
 }
 
 static int manager_setup_kdbus(Manager *m) {
+#ifdef ENABLE_KDBUS
         _cleanup_free_ char *p = NULL;
+#endif
 
+#ifdef ENABLE_KDBUS
         assert(m);
 
-#ifdef ENABLE_KDBUS
         if (m->kdbus_fd >= 0)
                 return 0;
 
@@ -2673,7 +2694,10 @@ int manager_environment_add(Manager *m, char **minus, char **plus) {
         if (b != l)
                 strv_free(b);
 
-        m->environment = strv_sort(l);
+        m->environment = l;
+        manager_clean_environment(m);
+        strv_sort(m->environment);
+
         return 0;
 }