dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 06:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsystemd-bus: sd_bus_request_name: fix return value for kdbus

Browse Source 
kdbus returns -EALREADY if the requesting connection is already the
owner of a name, and -EEXIST if the name already exists and the
connection is not able to take it over.

Also, n->flags needs a translation as well to match the SD_BUS_* enum
values.
This commit is contained in:
Daniel Mack
2013-11-26 17:24:18 +01:00
parent 0253ddccbb
commit ed99569df8
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsystemd-bus/bus-control.c
View File

@@ -84,10 +84,20 @@ _public_ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
#endif
r = ioctl(bus->input_fd, KDBUS_CMD_NAME_ACQUIRE, n);
if (r < 0)
return -errno;
if (r < 0) {
if (errno == -EALREADY)
return SD_BUS_NAME_ALREADY_OWNER;
return n->flags;
if (errno == -EEXIST)
return SD_BUS_NAME_EXISTS;
return -errno;
}
if (n->flags & KDBUS_NAME_IN_QUEUE)
return SD_BUS_NAME_IN_QUEUE;
return SD_BUS_NAME_PRIMARY_OWNER;
} else {
r = sd_bus_call_method(
bus,