diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-10-27 17:02:31 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-10-27 17:02:31 +0100 |
| commit | 5ebe2ce782a5f4614b3381ba093cbebded3d3ce6 (patch) | |
| tree | 399a734f2f97dc9a3f95450c8d5cfa42e8f32eac /src/libsystemd/sd-bus/bus-control.c | |
| parent | e0104622b33f39ea8fd54f0a286d938401c08e3d (diff) | |
sd-bus: sync kdbus.h (ABI break)
Some comment fixes and header cleanups in kdbus.h, and the task capability
meta information has been factored out to its own struct.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-control.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 39f4fc83a7..5a052d455e 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -495,8 +495,8 @@ static int bus_populate_creds_from_items(sd_bus *bus, SD_BUS_CREDS_INHERITABLE_CAPS | SD_BUS_CREDS_BOUNDING_CAPS) & mask; if (m) { - c->capability_size = item->size - KDBUS_ITEM_HEADER_SIZE; - c->capability = memdup(item->data, c->capability_size); + c->capability_size = item->size - offsetof(struct kdbus_item, caps.caps); + c->capability = memdup(item->caps.caps, c->capability_size); if (!c->capability) return -ENOMEM; |