Attachment 138222 Details for Bug 104641 – bus: Clear INVOCATION_ID when carrying out traditional activation

[patch] bus: Clear INVOCATION_ID when carrying out traditional activation

0001-bus-Clear-INVOCATION_ID-when-carrying-out-traditiona.patch (text/plain), 1.68 KB, created by Simon McVittie on 2018-03-20 12:34:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-03-20 12:34:45 UTC

Size: 1.68 KB

patch

obsolete

>From 745534fd65bda10e85b9504607e1a54431ca7967 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 20 Mar 2018 12:33:51 +0000
>Subject: [PATCH] bus: Clear INVOCATION_ID when carrying out traditional
> activation
>
>We weren't sure whether this one should be inherited or not, so I
>asked on systemd-devel, and Lennart thought it shouldn't.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/activation.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index 66640ba6..2a427d9c 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -862,7 +862,6 @@ populate_environment (BusActivation *activation)
>    * - TERM, WATCHDOG_*: Should not be set for dbus-daemon, so not applicable
>    * - MAINPID, SERVICE_RESULT, EXIT_CODE, EXIT_STATUS: Not set for ExecStart,
>    *   so not applicable
>-   * - INVOCATION_ID: TODO: Do we want to clear this or not? It isn't clear.
>    */
> 
>   /* We give activated services their own Journal stream to avoid their
>@@ -878,6 +877,13 @@ populate_environment (BusActivation *activation)
>    * (and NotifyAccess wouldn't let it write here anyway) */
>   _dbus_hash_table_remove_string (activation->environment, "NOTIFY_SOCKET");
> 
>+  /* This identifies the dbus-daemon invocation. Whether it should be
>+   * inherited by "smaller" services isn't entirely clear-cut, but not
>+   * inheriting it makes traditional D-Bus activation under systemd a
>+   * little more consistent with systemd activation.
>+   * https://lists.freedesktop.org/archives/systemd-devel/2018-March/040467.html */
>+  _dbus_hash_table_remove_string (activation->environment, "INVOCATION_ID");
>+
>   return retval;
> }
> 
>-- 
>2.16.2
>

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.