X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-control.c;h=bb33b14ff8105f95eeb91d556fecc62a746fa3bd;hp=a84b060b4fb0c4893b542b7d9a9728021d6e4051;hb=455971c1493fc6dc3125d235cf4ea6102cac626d;hpb=8f44e3ea3e0821625e584938e54623e7fb381bb8

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index a84b060b4..bb33b14ff 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -278,8 +278,8 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
                 }
 
                 KDBUS_ITEM_FOREACH(item, name, items)
-                        if (item->type == KDBUS_ITEM_NAME)
-                                entry_name = item->str;
+                        if (item->type == KDBUS_ITEM_OWNED_NAME)
+                                entry_name = item->name.name;
 
                 if (entry_name && service_name_is_valid(entry_name)) {
                         r = strv_extend(x, entry_name);
@@ -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;
 
@@ -524,7 +524,7 @@ static int bus_populate_creds_from_items(sd_bus *bus,
                         }
                         break;
 
-                case KDBUS_ITEM_NAME:
+                case KDBUS_ITEM_OWNED_NAME:
                         if ((mask & SD_BUS_CREDS_WELL_KNOWN_NAMES) && service_name_is_valid(item->name.name)) {
                                 r = strv_extend(&c->well_known_names, item->name.name);
                                 if (r < 0)
@@ -534,13 +534,13 @@ static int bus_populate_creds_from_items(sd_bus *bus,
                         }
                         break;
 
-                case KDBUS_ITEM_CONN_NAME:
-                        if ((mask & SD_BUS_CREDS_CONNECTION_NAME)) {
-                                c->conn_name = strdup(item->str);
-                                if (!c->conn_name)
+                case KDBUS_ITEM_CONN_DESCRIPTION:
+                        if ((mask & SD_BUS_CREDS_DESCRIPTION)) {
+                                c->description = strdup(item->str);
+                                if (!c->description)
                                         return -ENOMEM;
 
-                                c->mask |= SD_BUS_CREDS_CONNECTION_NAME;
+                                c->mask |= SD_BUS_CREDS_DESCRIPTION;
                         }
                         break;
                 }
@@ -826,10 +826,8 @@ _public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **r
 
         if (!isempty(bus->label) && (mask & SD_BUS_CREDS_SELINUX_CONTEXT)) {
                 c->label = strdup(bus->label);
-                if (!c->label) {
-                        sd_bus_creds_unref(c);
+                if (!c->label)
                         return -ENOMEM;
-                }
 
                 c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT;
         }
@@ -852,13 +850,12 @@ _public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **r
                         return r;
         } else {
                 r = bus_creds_add_more(c, mask, pid, 0);
-                if (r < 0) {
-                        sd_bus_creds_unref(c);
+                if (r < 0)
                         return r;
-                }
         }
 
         *ret = c;
+        c = NULL;
         return 0;
 }