From 3263ef39b89080cacccaf9b7b36675490a282f2d Mon Sep 17 00:00:00 2001 From: Lukasz Skalski Date: Tue, 17 Dec 2013 17:31:46 +0100 Subject: [PATCH 1/1] bus-driverd: Fix return code in driver_request_name RequestName return codes should be consistent with Dbus Specification. VALUE - DESCRIPTION 1-The caller is now the primary owner of the name, replacing any previous owner, 2-The name already had an owner (QUEUE flag was not specified), 3-The name already has an owner (QUEUE flag was specified), 4-Application trying to request ownership of a name is already the owner of it. --- src/bus-driverd/bus-driverd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c index 11bd2f932..a1ad0504c 100644 --- a/src/bus-driverd/bus-driverd.c +++ b/src/bus-driverd/bus-driverd.c @@ -348,10 +348,19 @@ static int driver_request_name(sd_bus *bus, sd_bus_message *m, void *userdata, s cmd_name->id = id; r = ioctl(sd_bus_get_fd(bus), KDBUS_CMD_NAME_ACQUIRE, cmd_name); - if (r < 0) - return r; + if (r < 0) { + if (errno == EEXIST) + return sd_bus_reply_method_return(m, "u", BUS_NAME_EXISTS); + else if (errno == EALREADY) + return sd_bus_reply_method_return(m, "u", BUS_NAME_ALREADY_OWNER); + else + return sd_bus_reply_method_return(m, "u", -errno); + } + + if (cmd_name->flags & KDBUS_NAME_IN_QUEUE) + return sd_bus_reply_method_return(m, "u", BUS_NAME_IN_QUEUE); - return sd_bus_reply_method_return(m, "u", 0); + return sd_bus_reply_method_return(m, "u", BUS_NAME_PRIMARY_OWNER); } static int driver_start_service_by_name(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { -- 2.30.2