[daemon-fix][daemon-opt] Fixed owner id when setting kdbus policy

[platform/upstream/dbus.git] / dbus / dbus-transport-kdbus.c

diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c
index 0e77f15..8d4095c 100644 (file)
--- a/dbus/dbus-transport-kdbus.c
+++ b/dbus/dbus-transport-kdbus.c
@@ -475,9 +475,9 @@ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo*
        pInfo->sec_label_len = 0;
        pInfo->sec_label = NULL;
        
-    item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
+  item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1;
        item_size = (item_size < 56) ? 56 : item_size;  //at least 56 bytes are needed by kernel to place info about name, otherwise error
-    size = sizeof(struct kdbus_cmd_name_info) + item_size;
+  size = sizeof(struct kdbus_cmd_name_info) + item_size;
 
        msg = malloc(size);
        if (!msg)
@@ -836,7 +836,7 @@ static int emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *mess
                        return -1;
                if(!bus_register_kdbus(name, (DBusTransportKdbus*)transport))
                        goto outH1;
-               if(!register_kdbus_policy(name, ((DBusTransportKdbus*)transport)->fd))
+               if(!register_kdbus_policy(name, transport, geteuid()))
                        goto outH1;
 
                sender = malloc (strlen(name) + 4);