Commit fc3bf2f3 authored by Matt Hoosier's avatar Matt Hoosier Committed by Simon McVittie

Don't forget allow_anonymous when merging configs

The algorithm to collapse a subsidiary config file's data into the
master data structure forgot to examine this flag.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73475Reviewed-by: 's avatarChengwei Yang <chengwei.yang@intel.com>
Reviewed-by: 's avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 46f591b2
......@@ -318,6 +318,9 @@ merge_included (BusConfigParser *parser,
if (included->keep_umask)
parser->keep_umask = TRUE;
if (included->allow_anonymous)
parser->allow_anonymous = TRUE;
if (included->pidfile != NULL)
{
dbus_free (parser->pidfile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment