chiark / gitweb /
sd-bus: ignore KDBUS_ITEM_TIMESTAMP in kernel messages
authorDaniel Mack <daniel@zonque.org>
Mon, 22 Dec 2014 18:59:53 +0000 (19:59 +0100)
committerDaniel Mack <daniel@zonque.org>
Mon, 22 Dec 2014 18:59:53 +0000 (19:59 +0100)
Kernel notifications carry a timestamp now, so make sure
bus_kernel_translate_message() doesn't complain when it stumbles across
them.

src/libsystemd/sd-bus/bus-kernel.c

index cdca48d92baa9cde3b403c042bcce8b7b6a89164..a69628945d8427c7ab4645414b7de19a73594c21 100644 (file)
@@ -1267,6 +1267,9 @@ static int bus_kernel_translate_message(sd_bus *bus, struct kdbus_msg *k) {
         assert(k->payload_type == KDBUS_PAYLOAD_KERNEL);
 
         KDBUS_ITEM_FOREACH(d, k, items) {
+                if (d->type == KDBUS_ITEM_TIMESTAMP)
+                        continue;
+
                 if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) {
                         if (found)
                                 return -EBADMSG;