bus: make sd_bus_request_name() and sd_bus_release_name() behave more like other...

[elogind.git] / src / core / dbus.c

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 7d7c6cbddc8cf96e6101d7df11f16be8119c325a..cda1c5d5bd8c8791505c2787208f319c61ae4f95 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -819,17 +819,12 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
          * after the new connection is set up and the name installed
          * to allow clients to synchronously wait for reexecution to
          * finish */
          * after the new connection is set up and the name installed
          * to allow clients to synchronously wait for reexecution to
          * finish */

-        r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING);
+        r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE);

         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
         }
 
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
         }
 

-        if (r != SD_BUS_NAME_PRIMARY_OWNER) {
-                log_error("Failed to acquire name.");
-                return -EEXIST;
-        }
-

         bus_list_names(m, bus);
 
         log_debug("Successfully connected to API bus.");
         bus_list_names(m, bus);
 
         log_debug("Successfully connected to API bus.");