From: Daniel Mack <daniel@zonque.org>
Date: Mon, 22 Dec 2014 18:59:53 +0000 (+0100)
Subject: sd-bus: ignore KDBUS_ITEM_TIMESTAMP in kernel messages
X-Git-Tag: v219~887
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=856d6e09887730f115e43faf9577b479f2beb3c4;hp=e24e415e5f3af2fe86d2be9a1f1a2e8d5f8c96bf

sd-bus: ignore KDBUS_ITEM_TIMESTAMP in kernel messages

Kernel notifications carry a timestamp now, so make sure
bus_kernel_translate_message() doesn't complain when it stumbles across
them.
---

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index cdca48d92..a69628945 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -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;