From: Thiago Macieira <thiago@kde.org>
Date: Tue, 28 Apr 2009 13:16:36 +0000 (+0200)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.0~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63196f69c420f55fbb1fa76adaa41877f7f06d7b;p=thirdparty%2Fdbus.git

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

63196f69c420f55fbb1fa76adaa41877f7f06d7b
diff --cc bus/config-parser-common.c
index 4965c1924,88e099ac5..5cdbba267
--- a/bus/config-parser-common.c
+++ b/bus/config-parser-common.c
@@@ -122,10 -118,10 +118,14 @@@ bus_config_parser_element_name_to_type 
      {
        return ELEMENT_SYSLOG;
      }
+   else if (strcmp (name, "keep_umask") == 0)
+     {
+       return ELEMENT_KEEP_UMASK;
+     }
 +  else if (strcmp (name, "allow_anonymous") == 0)
 +    {
 +      return ELEMENT_ALLOW_ANONYMOUS;
 +    }
    return ELEMENT_NONE;
  }
  
@@@ -174,12 -170,10 +174,12 @@@ bus_config_parser_element_type_to_name 
        return "selinux";
      case ELEMENT_ASSOCIATE:
        return "associate";
-     case ELEMENT_KEEP_UMASK:
-       return "keep_umask";
      case ELEMENT_SYSLOG:
        return "syslog";
+     case ELEMENT_KEEP_UMASK:
+       return "keep_umask";
 +    case ELEMENT_ALLOW_ANONYMOUS:
 +      return "allow_anonymous";
      }
  
    _dbus_assert_not_reached ("bad element type");
diff --cc bus/config-parser.c
index 34d8684a9,38ce8a1de..c3e8fba19
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@@ -111,13 -111,10 +111,12 @@@ struct BusConfigParse
  
    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 */
 +
 +  unsigned int allow_anonymous : 1; /**< TRUE to allow anonymous connections */
  };
  
  static Element*
@@@ -2293,11 -2275,10 +2292,11 @@@ bus_config_parser_content (BusConfigPar
      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:
      case ELEMENT_SELINUX:
      case ELEMENT_ASSOCIATE:
        if (all_whitespace (content))
@@@ -2625,17 -2606,11 +2624,17 @@@ bus_config_parser_get_syslog (BusConfig
  }
  
  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
 +bus_config_parser_get_allow_anonymous (BusConfigParser   *parser)
 +{
 +  return parser->allow_anonymous;
 +}
 +
  const char *
  bus_config_parser_get_pidfile (BusConfigParser   *parser)
  {
diff --cc dbus/dbus-sysdeps-util-unix.c
index dbab82365,039280442..f1e203348
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@@ -1234,5 -1233,4 +1234,4 @@@ fail
    _dbus_string_free (&cmdline);
    _dbus_string_free (&path);
    return FALSE;
 -}
 +}
-