logind: properly detect whether we got the bus name

2011-06-27 23:07:28 +02:00
parent e9816c4859
commit bafd4449ff
1 changed files with 9 additions and 2 deletions
@@ -764,8 +764,15 @@ static int manager_connect_bus(Manager *m) {
                goto fail;
        }

-        if (dbus_bus_request_name(m->bus, "org.freedesktop.login1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) < 0) {
-                log_error("Failed to register name on bus: %s", error.message);
+        r = dbus_bus_request_name(m->bus, "org.freedesktop.login1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to register name on bus: %s", bus_error_message(&error));
+                r = -EIO;
+                goto fail;
+        }
+
+        if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)  {
+                log_error("Failed to acquire name.");
                r = -EEXIST;
                goto fail;
        }