From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 10 Dec 2012 13:00:02 +0000 (+0100)
Subject: Revert "dnsmasq: Fix parsing of the version number"
X-Git-Tag: v1.0.1-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28de5479972900d2300d7f8d94fc228870360a10;p=thirdparty%2Flibvirt.git

Revert "dnsmasq: Fix parsing of the version number"

This reverts commit 5114431396fd125b6ebe4d1a20a981111f948ee7
which was pushed accidentally.
---

diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index a627ed2588..bee3b614b2 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf)
 
     caps->noRefresh = true;
 
-    if (!(p = strstr(buf, DNSMASQ_VERSION_STR)))
+    p = STRSKIP(buf, DNSMASQ_VERSION_STR);
+    if (!p)
        goto fail;
-    p += sizeof(DNSMASQ_VERSION_STR) - 1;
     virSkipSpaces(&p);
     if (virParseVersionString(p, &caps->version, true) < 0)
         goto fail;