diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-02-19 20:02:40 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-02-19 20:02:40 +0100 |
| commit | 00d053d3cacab6628405d704c5049274e1be297e (patch) | |
| tree | bb2de5fc3ed3ea4a6170f5c4bfc0edcfde3ff34f /src | |
| parent | ac92ced5bb41def1d90f871d6c8cfec2b03c0c7d (diff) | |
bus: sync with kdbus.git (ABI break)
This syncs up the new KDBUS_CMD_CONN_INFO behavior:
- attach-flags are passed in .attach_flags, instead of directly merged
with the command flags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/kdbus.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 06e5b4fd9a..bd439a95dd 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -654,7 +654,7 @@ int bus_get_name_creds_kdbus( mask |= SD_BUS_CREDS_PID; cmd->size = size; - cmd->flags = attach_flags_to_kdbus(mask); + cmd->attach_flags = attach_flags_to_kdbus(mask); r = ioctl(bus->input_fd, KDBUS_CMD_CONN_INFO, cmd); if (r < 0) @@ -919,7 +919,7 @@ static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds ** SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID))) mask |= SD_BUS_CREDS_PID; - cmd.flags = attach_flags_to_kdbus(mask); + cmd.attach_flags = attach_flags_to_kdbus(mask); r = ioctl(bus->input_fd, KDBUS_CMD_BUS_CREATOR_INFO, &cmd); if (r < 0) diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h index f7fbfd9929..4f321eb3eb 100644 --- a/src/libsystemd/sd-bus/kdbus.h +++ b/src/libsystemd/sd-bus/kdbus.h @@ -780,11 +780,13 @@ struct kdbus_cmd_list { /** * struct kdbus_cmd_info - struct used for KDBUS_CMD_CONN_INFO ioctl * @size: The total size of the struct - * @flags: KDBUS_ATTACH_* flags, userspace → kernel + * @flags: Flags for this ioctl, userspace → kernel * @return_flags: Command return flags, kernel → userspace * @id: The 64-bit ID of the connection. If set to zero, passing * @name is required. kdbus will look up the name to * determine the ID in this case. + * @attach_flags: Set of attach flags to specify the set of information + * to receive, userspace → kernel * @offset: Returned offset in the caller's pool buffer where the * kdbus_info struct result is stored. The user must * use KDBUS_CMD_FREE to free the allocated memory. @@ -802,6 +804,7 @@ struct kdbus_cmd_info { __u64 flags; __u64 return_flags; __u64 id; + __u64 attach_flags; __u64 offset; __u64 info_size; struct kdbus_item items[0]; |