diff options
Diffstat (limited to 'bus/config-parser.c')
-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); |