From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 27 Nov 2014 02:20:51 +0000 (+0100)
Subject: sd-bus: deal with whitespace in matches
X-Git-Tag: v218~291
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=771b2724c0f9591e8f4dd7463c15bf0c957737dc

sd-bus: deal with whitespace in matches
---

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 5658c61ba..0e92a85ef 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -748,6 +748,9 @@ int bus_match_parse(
                 bool escaped = false, quoted;
                 uint8_t u;
 
+                /* Avahi's match rules appear to include whitespace, skip over it */
+                p += strspn(p, " ");
+
                 eq = strchr(p, '=');
                 if (!eq)
                         return -EINVAL;