From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 14 Dec 2021 16:36:23 +0000 (+0100)
Subject: util: dnsmasq: mandate at least version 2.67
X-Git-Tag: v8.0.0-rc1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d1a5ff2ed2a6b2682aeaf44938f223be7e2d46;p=thirdparty%2Flibvirt.git

util: dnsmasq: mandate at least version 2.67

All the capabilities should be supported in 2.67.
Make this the minimum version, since even the oldest
distros we support have moved on:

Debian 8: 2.72
CentOS 7: 2.76
Ubuntu 18.04: 2.79

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 90a1ea35b6..f7743953e6 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -49,6 +49,9 @@ VIR_LOG_INIT("util.dnsmasq");
 #define DNSMASQ_HOSTSFILE_SUFFIX "hostsfile"
 #define DNSMASQ_ADDNHOSTSFILE_SUFFIX "addnhosts"
 
+#define DNSMASQ_MIN_MAJOR 2
+#define DNSMASQ_MIN_MINOR 67
+
 static void
 dhcphostFreeContent(dnsmasqDhcpHost *host)
 {
@@ -627,6 +630,15 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf)
     if (virParseVersionString(p, &caps->version, true) < 0)
         goto error;
 
+    if (caps->version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("dnsmasq version >= %u.%u required but %lu.%lu found"),
+                       DNSMASQ_MIN_MAJOR, DNSMASQ_MIN_MINOR,
+                       caps->version / 1000000,
+                       caps->version % 1000000 / 1000);
+        goto error;
+    }
+
     if (strstr(buf, "--bind-dynamic"))
         dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC);