From a1783d61a8a74dd91028cd065b8a23067419fe0a Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 22 Oct 2014 18:44:40 +0200 Subject: sd-bus: sync kdbus.h kdbus learned a new command to query a bus creator's credentials. Sync kdbus.h first, which also renames some struct to more generic terms. That is, however, not an ABI break this time. --- src/libsystemd/sd-bus/bus-control.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 5ff746c6fb..d344387bb3 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -399,8 +399,8 @@ static int bus_get_owner_kdbus( sd_bus_creds **creds) { _cleanup_bus_creds_unref_ sd_bus_creds *c = NULL; - struct kdbus_cmd_conn_info *cmd; - struct kdbus_conn_info *conn_info; + struct kdbus_cmd_info *cmd; + struct kdbus_info *conn_info; struct kdbus_item *item; size_t size, l; uint64_t m, id; @@ -410,12 +410,12 @@ static int bus_get_owner_kdbus( if (r < 0) return r; if (r > 0) { - size = offsetof(struct kdbus_cmd_conn_info, items); + size = offsetof(struct kdbus_cmd_info, items); cmd = alloca0_align(size, 8); cmd->id = id; } else { l = strlen(name) + 1; - size = offsetof(struct kdbus_cmd_conn_info, items) + KDBUS_ITEM_SIZE(l); + size = offsetof(struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(l); cmd = alloca0_align(size, 8); cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + l; cmd->items[0].type = KDBUS_ITEM_NAME; @@ -429,7 +429,7 @@ static int bus_get_owner_kdbus( if (r < 0) return -errno; - conn_info = (struct kdbus_conn_info *) ((uint8_t *) bus->kdbus_buffer + cmd->offset); + conn_info = (struct kdbus_info *) ((uint8_t *) bus->kdbus_buffer + cmd->offset); /* Non-activated names are considered not available */ if (conn_info->flags & KDBUS_HELLO_ACTIVATOR) { -- cgit v1.2.3-54-g00ecf