[Daemon fix] registering for ID change needs id match
authorMichal Eljasiewicz <m.eljasiewic@samsung.com>
Mon, 16 Dec 2013 15:37:28 +0000 (16:37 +0100)
committerMichal Eljasiewicz <m.eljasiewic@samsung.com>
Mon, 16 Dec 2013 15:37:46 +0000 (16:37 +0100)
Change-Id: Ie9727022a01e512ed71a7885252aea8e9056880d
Signed-off-by: Michal Eljasiewicz <m.eljasiewic@samsung.com>
bus/bus.c
bus/kdbus-d.c

index deb328e..d4e7872 100644 (file)
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1005,11 +1005,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
 
index 4b8a029..442650a 100644 (file)
@@ -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))
     {