picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

driverd: properly handle NameHasOwner() for unique names

Browse source
This commit is contained in:
Lennart Poettering 2013-12-21 18:35:27 +01:00
parent 908b8720b8
commit 050eb34da8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/bus-driverd/bus-driverd.c
View file

@ -555,17 +555,17 @@ static int driver_list_queued_owners(sd_bus *bus, sd_bus_message *m, void *userd
}
static int driver_name_has_owner(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
char *arg0;
const char *name;
int r;
r = sd_bus_message_read(m, "s", &arg0);
r = sd_bus_message_read(m, "s", &name);
if (r < 0)
return r;
assert_return(service_name_is_valid(arg0), -EINVAL);
assert_return(service_name_is_valid(name), -EINVAL);
r = sd_bus_get_owner(bus, arg0, 0, NULL);
if (r < 0 && r != -ENOENT)
r = sd_bus_get_owner(bus, name, 0, NULL);
if (r < 0 && r != -ENOENT && r != -ENXIO)
return r;
return sd_bus_reply_method_return(m, "b", r >= 0);