Attachment 136732 Details for Bug 104641 – bus: Don't pass systemd environment variables to activated services

[patch] bus: Don't pass systemd environment variables to activated services

0001-bus-Don-t-pass-systemd-environment-variables-to-acti.patch (text/plain), 1.22 KB, created by Simon McVittie on 2018-01-15 16:24:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-01-15 16:24:36 UTC

Size: 1.22 KB

patch

obsolete

>From 6cf5495c3465b00d11dcd6be15606544a1f55249 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 15 Jan 2018 15:26:33 +0000
>Subject: [PATCH 1/4] bus: Don't pass systemd environment variables to
> activated services
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/activation.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index edf96a2c..3669d4fb 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -848,6 +848,14 @@ populate_environment (BusActivation *activation)
>   retval = _dbus_hash_table_from_array (activation->environment, environment, '=');
>   dbus_free_string_array (environment);
> 
>+  /* These environment variables are set by systemd for the dbus-daemon
>+   * itself, and are not applicable to our child processes. */
>+  _dbus_hash_table_remove_string (activation->environment, "JOURNAL_STREAM");
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDNAMES");
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDS");
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_PID");
>+  _dbus_hash_table_remove_string (activation->environment, "NOTIFY_SOCKET");
>+
>   return retval;
> }
> 
>-- 
>2.15.1
>

Actions: View | Splinter Review

Attachments on bug 104641: 136730 | 136732 | 136733 | 136734 | 136735 | 137403 | 137404 | 138222

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.