diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-06-27 23:15:57 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-06-27 23:15:57 +0200 |
| commit | add10b5ae7636137f530e15efdf7af075d6361eb (patch) | |
| tree | 28100377b4325718b81b42bf790a90b23549ad77 /src | |
| parent | a2e5283217b9e1e636ab3272e8d36e724a78cf6a (diff) | |
dbus: fix name allocation logic
Diffstat (limited to 'src')
| -rw-r--r-- | src/hostnamed.c | 11 | ||||
| -rw-r--r-- | src/localed.c | 11 | ||||
| -rw-r--r-- | src/timedated.c | 11 |
3 files changed, 27 insertions, 6 deletions
diff --git a/src/hostnamed.c b/src/hostnamed.c index c6b63cd977..7b2ce691a3 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; } diff --git a/src/localed.c b/src/localed.c index 5efee0b2ac..93e4e9bd56 100644 --- a/src/localed.c +++ b/src/localed.c @@ -540,8 +540,15 @@ static int connect_bus(DBusConnection **_bus) { goto fail; } - if (dbus_bus_request_name(bus, "org.freedesktop.locale1", 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.locale1", 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; } diff --git a/src/timedated.c b/src/timedated.c index 097e0a00c2..55cc904f0c 100644 --- a/src/timedated.c +++ b/src/timedated.c @@ -543,8 +543,15 @@ static int connect_bus(DBusConnection **_bus) { goto fail; } - if (dbus_bus_request_name(bus, "org.freedesktop.timedate1", 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.timedate1", 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; } |