From: Kay Sievers <kay@vrfy.org>
Date: Thu, 12 Dec 2013 05:23:38 +0000 (+0100)
Subject: bus: add SD_BUS_NAME_REPLACE_EXISTING to all activatable services, fix one flags... 
X-Git-Tag: v209~1001
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d90bb66996f5e3e9b6987e60980ff721b6fc2aff;ds=sidebyside

bus: add SD_BUS_NAME_REPLACE_EXISTING to all activatable services, fix one flags conversion
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 3f08d1c0e..36845c497 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -574,7 +574,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
                 return r;
         }
 
-        r = sd_bus_request_name(bus, "org.freedesktop.hostname1", 0);
+        r = sd_bus_request_name(bus, "org.freedesktop.hostname1", SD_BUS_NAME_REPLACE_EXISTING);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 0437c96a9..c5817a78d 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -1020,7 +1020,7 @@ int kdbus_translate_request_name_flags(uint64_t flags, uint64_t *kdbus_flags) {
         if (flags & SD_BUS_NAME_REPLACE_EXISTING)
                 f |= KDBUS_NAME_REPLACE_EXISTING;
 
-        if (!(flags & SD_BUS_NAME_QUEUE))
+        if (flags & SD_BUS_NAME_QUEUE)
                 f |= KDBUS_NAME_QUEUE;
 
         *kdbus_flags = f;
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 65318b606..54f297177 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1094,7 +1094,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
                 return r;
         }
 
-        r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
+        r = sd_bus_request_name(bus, "org.freedesktop.locale1", SD_BUS_NAME_REPLACE_EXISTING);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
diff --git a/src/login/logind.c b/src/login/logind.c
index 222608743..29f527259 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -727,7 +727,7 @@ static int manager_connect_bus(Manager *m) {
                 return r;
         }
 
-        r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
+        r = sd_bus_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_REPLACE_EXISTING);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 6550075b5..f695cfe11 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -219,7 +219,7 @@ static int manager_connect_bus(Manager *m) {
                 return r;
         }
 
-        r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
+        r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", SD_BUS_NAME_REPLACE_EXISTING);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 37173a252..c1ceeee07 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -791,7 +791,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
                 return r;
         }
 
-        r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
+        r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_REPLACE_EXISTING);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;