Don't forget allow_anonymous when merging configs
authorMatt Hoosier <matt.hoosier@garmin.com>
Thu, 9 Jan 2014 22:15:31 +0000 (16:15 -0600)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 14 Jan 2014 11:04:18 +0000 (11:04 +0000)
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>
bus/config-parser.c

index 12a2d2e..a6a8e1c 100644 (file)
@@ -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);