bus: rework how we attach fds to event loops

[elogind.git] / src / libsystemd-bus / bus-control.c

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 2682439427b606621ffe2cc41aa5518a5cb6db77..5125fd9724b0fcb52cf70862eb625d1e0a06e2f7 100644 (file)
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -265,7 +265,7 @@ static int bus_list_names_kernel(sd_bus *bus, char ***acquired, char ***activata
         }
 
         if (activatable) {
-                r = kernel_get_list(bus, KDBUS_NAME_LIST_STARTERS, &y);
+                r = kernel_get_list(bus, KDBUS_NAME_LIST_ACTIVATORS, &y);
                 if (r < 0)
                         return r;
 
@@ -741,7 +741,7 @@ static int add_name_change_match(sd_bus *bus,
                         return 0;
         }
 
-        if (old_owner) {
+        if (!isempty(old_owner)) {
                 r = bus_kernel_parse_unique_name(old_owner, &old_owner_id);
                 if (r < 0)
                         return 0;
@@ -751,7 +751,7 @@ static int add_name_change_match(sd_bus *bus,
                         return 0;
         }
 
-        if (new_owner) {
+        if (!isempty(new_owner)) {
                 r = bus_kernel_parse_unique_name(new_owner, &new_owner_id);
                 if (r < 0)
                         return r;