diff options
author | Thiago Macieira <thiago@kde.org> | 2009-04-28 15:16:36 +0200 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2009-04-28 15:16:36 +0200 |
commit | 63196f69c420f55fbb1fa76adaa41877f7f06d7b (patch) | |
tree | f1d97096f6c821dbd3b995b1e79749fe292e329d | |
parent | 705b34f0a60566c3acc88d5465603b5da959ba1f (diff) | |
parent | b2f943e9c0d5ae1d6293d418b0c0b2a03799bb84 (diff) |
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
-rw-r--r-- | bus/config-parser-common.c | 12 | ||||
-rw-r--r-- | bus/config-parser.c | 33 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 1 |
4 files changed, 23 insertions, 25 deletions
diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c index 4965c192..5cdbba26 100644 --- a/bus/config-parser-common.c +++ b/bus/config-parser-common.c @@ -114,14 +114,14 @@ bus_config_parser_element_name_to_type (const char *name) { return ELEMENT_ASSOCIATE; } - else if (strcmp (name, "keep_umask") == 0) - { - return ELEMENT_KEEP_UMASK; - } else if (strcmp (name, "syslog") == 0) { 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; @@ -174,10 +174,10 @@ bus_config_parser_element_type_to_name (ElementType type) 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"; } 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 diff --git a/configure.in b/configure.in index 9d825c7d..c1eabf0c 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.52) m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [2]) -m4_define([dbus_micro_version], [3]) +m4_define([dbus_micro_version], [13]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT(dbus, [dbus_version]) diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index dbab8236..f1e20334 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1235,4 +1235,3 @@ fail: _dbus_string_free (&path); return FALSE; } - |