libsystemd-bus: catch up with latest kdbus changes

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 6f0bf06a5fa1f20c990697d89d64e691592eb51a..aaddb7d374a93de9b28680bd342aa00ea7c60ce4 100644 (file)
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -182,7 +182,7 @@ _public_ int sd_bus_list_names(sd_bus *bus, char ***l) {
                 if (!cmd)
                         return -ENOMEM;
 
-                cmd->flags = KDBUS_NAME_LIST_UNIQUE_NAMES;
+                cmd->flags = KDBUS_NAME_LIST_UNIQUE | KDBUS_NAME_LIST_NAMES;
 
                 r = ioctl(sd_bus_get_fd(bus), KDBUS_CMD_NAME_LIST, cmd);
                 if (r < 0)

diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 76a55c7822690144b7aa9d0d4542a18c55916cb7..ca36eb86384f70b7a084ab415c5b3867bf2698c5 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -830,7 +830,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
         if (!m->destination) {
                 if (destination)
                         m->destination = destination;
-                else if (k->dst_id != KDBUS_DST_ID_WELL_KNOWN_NAME &&
+                else if (k->dst_id != KDBUS_DST_ID_NAME &&
                          k->dst_id != KDBUS_DST_ID_BROADCAST) {
                         snprintf(m->destination_buffer, sizeof(m->destination_buffer), ":1.%llu", (unsigned long long) k->dst_id);
                         m->destination = m->destination_buffer;

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 98f513fd6f6e7edc3ef1975d44481202a2e0433b..09a73fa1093ccf96c13e1fffafce17fb53e01d8b 100644 (file)
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -22,7 +22,7 @@
 
 #define KDBUS_IOC_MAGIC                        0x95
 #define KDBUS_SRC_ID_KERNEL            (0)
-#define KDBUS_DST_ID_WELL_KNOWN_NAME   (0)
+#define KDBUS_DST_ID_NAME              (0)
 #define KDBUS_MATCH_SRC_ID_ANY         (~0ULL)
 #define KDBUS_DST_ID_BROADCAST         (~0ULL)
 
@@ -444,9 +444,10 @@ struct kdbus_cmd_name {
 
 /* KDBUS_CMD_NAME_LIST */
 enum {
-       KDBUS_NAME_LIST_UNIQUE_NAMES            = 1 <<  0,
-       KDBUS_NAME_LIST_STARTERS_ONLY           = 1 <<  1,
-       KDBUS_NAME_LIST_QUEUED_OWNERS           = 1 <<  2,
+       KDBUS_NAME_LIST_UNIQUE          = 1 <<  0,
+       KDBUS_NAME_LIST_NAMES           = 1 <<  1,
+       KDBUS_NAME_LIST_STARTERS        = 1 <<  2,
+       KDBUS_NAME_LIST_QUEUED          = 1 <<  3,
 };
 
 /**