summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Eljasiewicz <m.eljasiewic@samsung.com>2013-12-16 16:37:28 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-02-11 11:55:30 +0100
commit605f1b1dec3ef06ac8492a5481f553f12c5d4b02 (patch)
treee2df2c58e0e122652849f2ab930a918203aa6f59
parentae98375c0b8e0eef3ac9ca0f1bf3c8bc7162cda5 (diff)
[Daemon fix] registering for ID change needs id match
Change-Id: Ie9727022a01e512ed71a7885252aea8e9056880d Signed-off-by: Michal Eljasiewicz <m.eljasiewic@samsung.com>
-rw-r--r--bus/bus.c4
-rw-r--r--bus/kdbus-d.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/bus/bus.c b/bus/bus.c
index 132ad7ca..872e4595 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1041,11 +1041,11 @@ bus_context_new (const DBusString *config_file,
_dbus_verbose ("Registering org.freedesktop.DBus name for daemon failed!\n");
goto failed;
}
- /* if(!register_kdbus_starters(context->myKdbusConnection)) TODO repair in kdbus
+ if(!register_kdbus_starters(context->myKdbusConnection)) //TODO repair in kdbus
{
_dbus_verbose ("Registering kdbus starters for dbus activatable names failed!\n");
goto failed;
- }*/
+ }
}
#endif
diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c
index 4b8a029f..442650a9 100644
--- a/bus/kdbus-d.c
+++ b/bus/kdbus-d.c
@@ -465,6 +465,7 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection)
pItem = KDBUS_PART_NEXT(pItem);
pItem->type = KDBUS_MATCH_ID_REMOVE;
pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64);
+ pItem->id = KDBUS_MATCH_SRC_ID_ANY;
if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match))
{