diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-12-12 06:23:38 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-12-12 06:41:23 +0100 |
| commit | d90bb66996f5e3e9b6987e60980ff721b6fc2aff (patch) | |
| tree | 36f2cb82f63a022f2517f92c20120fcad9a39fcb | |
| parent | 29a07cdb4a317f2e1ea160b79bfe6eb1be2e6e01 (diff) | |
bus: add SD_BUS_NAME_REPLACE_EXISTING to all activatable services, fix one flags conversion
| -rw-r--r-- | src/hostname/hostnamed.c | 2 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-kernel.c | 2 | ||||
| -rw-r--r-- | src/locale/localed.c | 2 | ||||
| -rw-r--r-- | src/login/logind.c | 2 | ||||
| -rw-r--r-- | src/machine/machined.c | 2 | ||||
| -rw-r--r-- | src/timedate/timedated.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 3f08d1c0ec..36845c4972 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 0437c96a9e..c5817a78d6 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 65318b6067..54f297177c 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 222608743e..29f527259b 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 6550075b56..f695cfe116 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 37173a252c..c1ceeee070 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; |