From 5ebe2ce782a5f4614b3381ba093cbebded3d3ce6 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 27 Oct 2014 17:02:31 +0100 Subject: 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. --- src/libsystemd/sd-bus/bus-control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsystemd/sd-bus/bus-control.c') 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; -- cgit v1.2.3-54-g00ecf