X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostnamed.c;h=7b2ce691a378a244bbb5112753ffad8792c98659;hp=c6b63cd9777ef900a5171e1ef3195f38acefd87a;hb=34c4b47b7f00041be03919bd36500d0ffb3959d3;hpb=a2e5283217b9e1e636ab3272e8d36e724a78cf6a

diff --git a/src/hostnamed.c b/src/hostnamed.c
index c6b63cd97..7b2ce691a 100644
--- a/src/hostnamed.c
+++ b/src/hostnamed.c
@@ -524,8 +524,15 @@ static int connect_bus(DBusConnection **_bus) {
                 goto fail;
         }
 
-        if (dbus_bus_request_name(bus, "org.freedesktop.hostname1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) < 0) {
-                log_error("Failed to register name on bus: %s", error.message);
+        r = dbus_bus_request_name(bus, "org.freedesktop.hostname1", 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 = -EEXIST;
+                goto fail;
+        }
+
+        if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+                log_error("Failed to acquire name.");
                 r = -EEXIST;
                 goto fail;
         }