Attachment 63611 Details for Bug 51560 – Proposed patch

[patch] Proposed patch

0001-Merge-servicehelper-from-included-config-file.patch (text/plain), 1.25 KB, created by Krzysztof Konopko on 2012-06-29 05:43:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Konopko

Created: 2012-06-29 05:43:34 UTC

Size: 1.25 KB

patch

obsolete

>From d8feaf69d2fa1bd38a031a3ce33e453dc18debcf Mon Sep 17 00:00:00 2001
>From: Krzysztof Konopko <krzysztof.konopko@youview.com>
>Date: Fri, 29 Jun 2012 13:40:37 +0100
>Subject: [PATCH] Merge <servicehelper> from included config file
>
><servicehelper> is not supported in the included config file, i. e. it's not merged in merge_included().
>There's clearly no reason it shouldn't be supported in the included config file along with <user>, <type> and others.
>It's quite reasonable for a client willing to override the default servicehelper, e. g. in system-local.conf.
>---
> bus/config-parser.c |    9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
>diff --git a/bus/config-parser.c b/bus/config-parser.c
>index 07e8fbb..1d1b8bf 100644
>--- a/bus/config-parser.c
>+++ b/bus/config-parser.c
>@@ -323,7 +323,14 @@ merge_included (BusConfigParser *parser,
>       parser->pidfile = included->pidfile;
>       included->pidfile = NULL;
>     }
>-  
>+
>+  if (included->servicehelper != NULL)
>+    {
>+      dbus_free (parser->servicehelper);
>+      parser->servicehelper = included->servicehelper;
>+      included->servicehelper = NULL;
>+    }
>+
>   while ((link = _dbus_list_pop_first_link (&included->listen_on)))
>     _dbus_list_append_link (&parser->listen_on, link);
> 
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 51560: 63611

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.