diff options
| author | Matt Hoosier <matt.hoosier@garmin.com> | 2014-01-09 16:15:31 -0600 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-14 11:04:18 +0000 |
| commit | fc3bf2f30472aa87b0e8eedb6aa3b0a78043cd8b (patch) | |
| tree | 60ce6280bd31fac3290b98605dfd6e787cef3fb2 | |
| parent | 46f591b2be6f2a05df8dc7251ea44a149ce519e1 (diff) | |
| download | dbus-fc3bf2f30472aa87b0e8eedb6aa3b0a78043cd8b.tar.gz | |
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=73475
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | bus/config-parser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index 12a2d2e7..a6a8e1cf 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -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); |