diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-04-10 13:27:23 -0700 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-04-10 13:27:23 -0700 |
| commit | 862bbf89c6e3db0a3ec265310eb6a92e0f1c375d (patch) | |
| tree | 93db31b41699ddf264fc78fed6fe7bf8ed2dce9c | |
| parent | dec51b29f9c7bd63b3c0555b486d163fb94981c9 (diff) | |
bus: catch up with kdbus changes (ABI break)
| -rw-r--r-- | src/bus-driverd/bus-driverd.c | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c index 3284d62534..4756c481bd 100644 --- a/src/bus-driverd/bus-driverd.c +++ b/src/bus-driverd/bus-driverd.c @@ -375,7 +375,7 @@ static int get_creds_by_name(sd_bus *bus, const char *name, uint64_t mask, sd_bu assert_return(service_name_is_valid(name), -EINVAL); r = sd_bus_get_owner(bus, name, mask, &c); - if (r == -ENOENT || r == -ENXIO) + if (r == -ESRCH || r == -ENXIO) return sd_bus_error_setf(error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Name %s is currently not owned by anyone.", name); if (r < 0) return r; @@ -585,7 +585,7 @@ static int driver_name_has_owner(sd_bus *bus, sd_bus_message *m, void *userdata, assert_return(service_name_is_valid(name), -EINVAL); r = sd_bus_get_owner(bus, name, 0, NULL); - if (r < 0 && r != -ENOENT && r != -ENXIO) + if (r < 0 && r != -ESRCH && r != -ENXIO) return r; return sd_bus_reply_method_return(m, "b", r >= 0); @@ -694,7 +694,7 @@ static int driver_start_service_by_name(sd_bus *bus, sd_bus_message *m, void *us r = sd_bus_get_owner(bus, name, 0, NULL); if (r >= 0) return sd_bus_reply_method_return(m, "u", BUS_START_REPLY_ALREADY_RUNNING); - if (r != -ENOENT) + if (r != -ESRCH) return r; u = strappenda(name, ".busname"); diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index bd392a2937..8eb0232ca4 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -395,7 +395,7 @@ static int bus_get_owner_kdbus( /* Non-activated names are considered not available */ if (conn_info->flags & KDBUS_HELLO_ACTIVATOR) - return name[0] == ':' ? -ENXIO : -ENOENT; + return name[0] == ':' ? -ENXIO : -ESRCH; c = bus_creds_new(); if (!c) |