bus: update kdbus.h (ABI break)

We changed creds to u32, so fix systemd sd-bus to acknowledge that.

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 2bfce933e3877f0cca534d9efa1c4ab934be90d9..907c5c5cf6458fbda0887a1c8c5eaca8bcfb4a6c 100644 (file)
--- 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 3e841f4003d55a4976858a94820a7b9445ec6e43..7a58785f36d05d8408eef51ca2b34bb16a67b0b1 100644 (file)
--- 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;
 };
 
 /**