bus: open user, not system, bus in bus_open_user_systemd()

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

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 30ee67e85050ab63d96f31653b9b6272e6db6fbc..a468bcad6b81dfb7dbd0c02c9c3d1ed72aaba8cb 100644 (file)
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -87,7 +87,13 @@ int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name) {
         return 0;
 }
 
-int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout) {
+int bus_event_loop_with_idle(
+                sd_event *e,
+                sd_bus *bus,
+                const char *name,
+                usec_t timeout,
+                check_idle_t check_idle,
+                void *userdata) {
         bool exiting = false;
         int r, code;
 
@@ -96,14 +102,20 @@ int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t
         assert(name);
 
         for (;;) {
+                bool idle;
+
                 r = sd_event_get_state(e);
                 if (r < 0)
                         return r;
-
                 if (r == SD_EVENT_FINISHED)
                         break;
 
-                r = sd_event_run(e, exiting ? (uint64_t) -1 : timeout);
+                if (check_idle)
+                        idle = check_idle(userdata);
+                else
+                        idle = true;
+
+                r = sd_event_run(e, exiting || !idle ? (uint64_t) -1 : timeout);
                 if (r < 0)
                         return r;
 
@@ -212,8 +224,12 @@ int bus_verify_polkit(
                 }
 
                 r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
-                if (r >= 0)
-                        r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+                if (r < 0)
+                        return r;
 
                 if (authorized)
                         return 1;
@@ -328,7 +344,7 @@ int bus_verify_polkit_async(
                         if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN))
                                 return -EACCES;
 
-                        return sd_bus_error_get_errno(e);
+                        return -sd_bus_error_get_errno(e);
                 }
 
                 r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}");
@@ -467,7 +483,7 @@ int bus_open_system_systemd(sd_bus **_bus) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_set_address(bus, "kernel:path=/dev/kdbus/0-system/bus");
+        r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_PATH);
         if (r < 0)
                 return r;
 
@@ -520,7 +536,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
         if (r < 0)
                 return r;
 
-        if (asprintf(&bus->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid()) < 0)
+        if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, (unsigned long) getuid()) < 0)
                 return -ENOMEM;
 
         bus->bus_client = true;
@@ -537,7 +553,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
 
         e = secure_getenv("XDG_RUNTIME_DIR");
         if (!e)
-                return sd_bus_open_system(_bus);
+                return sd_bus_open_user(_bus);
 
         ee = bus_address_escape(e);
         if (!ee)
@@ -553,7 +569,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
 
         r = sd_bus_start(bus);
         if (r < 0)
-                return sd_bus_open_system(_bus);
+                return sd_bus_open_user(_bus);
 
         r = bus_check_peercred(bus);
         if (r < 0)
@@ -997,6 +1013,8 @@ int bus_map_all_properties(sd_bus *bus,
                                 r = prop->set(bus, member, m, &error, v);
                         else
                                 r = map_basic(bus, member, m, &error, v);
+                        if (r < 0)
+                                return r;
 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)