Merge branch 'dbus-1.2'

Conflicts:
	bus/bus.c
	bus/config-parser-common.c
	bus/config-parser-common.h
	bus/config-parser.c
	bus/connection.c
	bus/dbus-daemon.1.in
	dbus/dbus-marshal-validate-util.c
	dbus/dbus-marshal-validate.c
	dbus/dbus-sysdeps-util-unix.c
	test/name-test/tmp-session-like-system.conf

1 files changed, 16 insertions, 17 deletions

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 34d8684a..c3e8fba1 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -111,9 +111,8 @@ struct BusConfigParser
 
   unsigned int fork : 1; /**< TRUE to fork into daemon mode */
 
-  unsigned int keep_umask : 1; /**< TRUE to keep original umask when forking */
-
   unsigned int syslog : 1; /**< TRUE to enable syslog */
+  unsigned int keep_umask : 1; /**< TRUE to keep original umask when forking */
 
   unsigned int is_toplevel : 1; /**< FALSE if we are a sub-config-file inside another one */
 
@@ -707,33 +706,33 @@ start_busconfig_child (BusConfigParser   *parser,
       
       return TRUE;
     }
-  else if (element_type == ELEMENT_KEEP_UMASK)
+  else if (element_type == ELEMENT_SYSLOG)
     {
-      if (!check_no_attributes (parser, "keep_umask", attribute_names, attribute_values, error))
+      if (!check_no_attributes (parser, "syslog", attribute_names, attribute_values, error))
         return FALSE;
 
-      if (push_element (parser, ELEMENT_KEEP_UMASK) == NULL)
+      if (push_element (parser, ELEMENT_SYSLOG) == NULL)
         {
           BUS_SET_OOM (error);
           return FALSE;
         }
-
-      parser->keep_umask = TRUE;
+      
+      parser->syslog = TRUE;
       
       return TRUE;
     }
-  else if (element_type == ELEMENT_SYSLOG)
+  else if (element_type == ELEMENT_KEEP_UMASK)
     {
-      if (!check_no_attributes (parser, "syslog", attribute_names, attribute_values, error))
+      if (!check_no_attributes (parser, "keep_umask", attribute_names, attribute_values, error))
         return FALSE;
 
-      if (push_element (parser, ELEMENT_SYSLOG) == NULL)
+      if (push_element (parser, ELEMENT_KEEP_UMASK) == NULL)
         {
           BUS_SET_OOM (error);
           return FALSE;
         }
 
-      parser->syslog = TRUE;
+      parser->keep_umask = TRUE;
       
       return TRUE;
     }
@@ -2005,8 +2004,8 @@ bus_config_parser_end_element (BusConfigParser   *parser,
     case ELEMENT_ALLOW:
     case ELEMENT_DENY:
     case ELEMENT_FORK:
-    case ELEMENT_KEEP_UMASK:
     case ELEMENT_SYSLOG:
+    case ELEMENT_KEEP_UMASK:
     case ELEMENT_SELINUX:
     case ELEMENT_ASSOCIATE:
     case ELEMENT_STANDARD_SESSION_SERVICEDIRS:
@@ -2293,8 +2292,8 @@ bus_config_parser_content (BusConfigParser   *parser,
     case ELEMENT_ALLOW:
     case ELEMENT_DENY:
     case ELEMENT_FORK:
-    case ELEMENT_KEEP_UMASK:
     case ELEMENT_SYSLOG:
+    case ELEMENT_KEEP_UMASK:
     case ELEMENT_STANDARD_SESSION_SERVICEDIRS:    
     case ELEMENT_STANDARD_SYSTEM_SERVICEDIRS:    
     case ELEMENT_ALLOW_ANONYMOUS:
@@ -2619,15 +2618,15 @@ bus_config_parser_get_fork (BusConfigParser   *parser)
 }
 
 dbus_bool_t
-bus_config_parser_get_keep_umask (BusConfigParser   *parser)
+bus_config_parser_get_syslog (BusConfigParser   *parser)
 {
-  return parser->keep_umask;
+  return parser->syslog;
 }
 
 dbus_bool_t
-bus_config_parser_get_syslog (BusConfigParser   *parser)
+bus_config_parser_get_keep_umask (BusConfigParser   *parser)
 {
-  return parser->syslog;
+  return parser->keep_umask;
 }
 
 dbus_bool_t