diff options
| author | Krzysztof Konopko <krzysztof.konopko@youview.com> | 2012-06-29 13:40:37 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-02-12 10:49:29 +0000 |
| commit | 161b7d7007dc17f7540bf5735487cc2e53865168 (patch) | |
| tree | fbc7427286bc94738343de7ce2557f3e0d3d73d1 | |
| parent | 325c018c1f8a6b45de8d0280e062fdfaf49fe52e (diff) | |
| download | dbus-161b7d7007dc17f7540bf5735487cc2e53865168.tar.gz | |
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.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51560
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | 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 07e8fbb6..1d1b8bf0 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); |