From: Matt Hoosier <matt.hoosier@garmin.com>
Date: Thu, 9 Jan 2014 22:15:31 +0000 (-0600)
Subject: Don't forget allow_anonymous when merging configs
X-Git-Tag: dbus-1.8.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3bf2f30472aa87b0e8eedb6aa3b0a78043cd8b;p=thirdparty%2Fdbus.git

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>
---

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 12a2d2e7b..a6a8e1cfb 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);