diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/bus.c | 1 | ||||
| -rw-r--r-- | bus/dispatch.c | 6 | ||||
| -rw-r--r-- | bus/driver.c | 2 |
3 files changed, 4 insertions, 5 deletions
@@ -919,6 +919,7 @@ bus_context_check_security_policy (BusContext *context, type = dbus_message_get_type (message); /* dispatch.c was supposed to ensure these invariants */ + /* FIXME this assertion is failing in make check */ _dbus_assert (dbus_message_get_destination (message) != NULL || type == DBUS_MESSAGE_TYPE_SIGNAL); _dbus_assert (type == DBUS_MESSAGE_TYPE_SIGNAL || diff --git a/bus/dispatch.c b/bus/dispatch.c index 6c5eadf1..26dd4fc8 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -173,10 +173,8 @@ bus_dispatch (DBusConnection *connection, #endif /* DBUS_ENABLE_VERBOSE_MODE */ /* If service_name is NULL, if it's a signal we send it to all - * connections with a match rule. If it's not a signal, it goes to - * the bus daemon but doesn't go "on the bus"; e.g. a peer-to-peer - * ping. Handle these immediately, especially disconnection - * messages. There are no security policy checks on these. + * connections with a match rule. If it's not a signal, there + * are some special cases here but mostly we just bail out. */ if (service_name == NULL) { diff --git a/bus/driver.c b/bus/driver.c index 4d345698..9681d84f 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -245,7 +245,7 @@ create_unique_client_name (BusRegistry *registry, if (!_dbus_string_append_int (str, next_major_number)) return FALSE; - if (!_dbus_string_append (str, "-")) + if (!_dbus_string_append (str, ".")) return FALSE; if (!_dbus_string_append_int (str, next_minor_number)) |