diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-11-26 11:11:54 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-11-26 11:11:54 +0100 |
| commit | affc7fe9e1295e209c332a26acbbc992b710fe82 (patch) | |
| tree | 8f83d27203b71557d02c05520f47309e8536b834 /src | |
| parent | 279f036675536d55c901562b49f9df146af1a0e3 (diff) | |
bus: update kdbus.h (ABI break)
We changed creds to u32, so fix systemd sd-bus to acknowledge that.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/kdbus.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 2bfce933e..907c5c5cf 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -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) { size_t i, n; 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); if (!u) { 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++) - u[i] = (uid_t) d->data64[i]; + u[i] = (uid_t) d->data32[i]; m->creds.supplementary_gids = u; m->creds.n_supplementary_gids = n; diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h index 3e841f400..7a58785f3 100644 --- a/src/libsystemd/sd-bus/kdbus.h +++ b/src/libsystemd/sd-bus/kdbus.h @@ -70,14 +70,14 @@ struct kdbus_notify_name_change { * KDBUS_ITEM_CREDS */ struct kdbus_creds { - __u64 uid; - __u64 euid; - __u64 suid; - __u64 fsuid; - __u64 gid; - __u64 egid; - __u64 sgid; - __u64 fsgid; + __u32 uid; + __u32 euid; + __u32 suid; + __u32 fsuid; + __u32 gid; + __u32 egid; + __u32 sgid; + __u32 fsgid; }; /** |