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

bus: update kdbus.h (ABI break) 

We changed creds to u32, so fix systemd sd-bus to acknowledge that.
This commit is contained in:
David Herrmann 2014-11-26 11:11:54 +01:00
parent 279f036675
commit affc7fe9e1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-bus/bus-kernel.c
View File

@ -679,7 +679,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (bus->creds_mask & SD_BUS_CREDS_SUPPLEMENTARY_GIDS) { if (bus->creds_mask & SD_BUS_CREDS_SUPPLEMENTARY_GIDS) {
size_t i, n; size_t i, n;
uid_t *u; uid_t *u;
n = (d->size - offsetof(struct kdbus_item, data64)) / sizeof(uint64_t); n = (d->size - offsetof(struct kdbus_item, data32)) / sizeof(uint32_t);
u = new(uid_t, n); u = new(uid_t, n);
if (!u) { if (!u) {
r = -ENOMEM; r = -ENOMEM;
@ -687,7 +687,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
} }
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
u[i] = (uid_t) d->data64[i]; u[i] = (uid_t) d->data32[i];
m->creds.supplementary_gids = u; m->creds.supplementary_gids = u;
m->creds.n_supplementary_gids = n; m->creds.n_supplementary_gids = n;

16
src/libsystemd/sd-bus/kdbus.h
View File

@ -70,14 +70,14 @@ struct kdbus_notify_name_change {
* KDBUS_ITEM_CREDS * KDBUS_ITEM_CREDS
*/ */
struct kdbus_creds { struct kdbus_creds {
__u64 uid; __u32 uid;
__u64 euid; __u32 euid;
__u64 suid; __u32 suid;
__u64 fsuid; __u32 fsuid;
__u64 gid; __u32 gid;
__u64 egid; __u32 egid;
__u64 sgid; __u32 sgid;
__u64 fsgid; __u32 fsgid;
}; };
/** /**