]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "dnsmasq: Fix parsing of the version number"
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 10 Dec 2012 13:00:02 +0000 (14:00 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 10 Dec 2012 13:00:02 +0000 (14:00 +0100)
This reverts commit 5114431396fd125b6ebe4d1a20a981111f948ee7
which was pushed accidentally.

src/util/dnsmasq.c

index a627ed2588281b7bf7b7a15e16309b69a8248b03..bee3b614b28b7c07b80bcd15e0d538ff776966ef 100644 (file)
@@ -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;