Re: [libvirt PATCH 09/17] util: dnsmasq: delete assumed capability flags

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 12/14/21 2:09 PM, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
  src/util/virdnsmasq.c | 22 ++--------------------
  src/util/virdnsmasq.h |  4 ----
  2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index efe65174f8..016d9d64a8 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -640,27 +640,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf)
          goto error;
      }
- if (strstr(buf, "--bind-dynamic"))
-        dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC);
-
-    /* if this string is a part of the --version output, dnsmasq
-     * has been patched to use SO_BINDTODEVICE when listening,
-     * so that it will only accept requests that arrived on the
-     * listening interface(s)
-     */
-    if (strstr(buf, "--bind-interfaces with SO_BINDTODEVICE"))
-        dnsmasqCapsSet(caps, DNSMASQ_CAPS_BINDTODEVICE);
-
-    if (strstr(buf, "--ra-param"))
-        dnsmasqCapsSet(caps, DNSMASQ_CAPS_RA_PARAM);
-
-    VIR_INFO("dnsmasq version is %d.%d, --bind-dynamic is %spresent, "
-             "SO_BINDTODEVICE is %sin use, --ra-param is %spresent",
+    VIR_INFO("dnsmasq version is %d.%d",
               (int)caps->version / 1000000,
-             (int)(caps->version % 1000000) / 1000,
-             dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) ? "" : "NOT ",
-             dnsmasqCapsGet(caps, DNSMASQ_CAPS_BINDTODEVICE) ? "" : "NOT ",
-             dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM) ? "" : "NOT ");
+             (int)(caps->version % 1000000) / 1000);

One would hope that nobody is actually looking for these strings in a script anywhere :-/ (To clarify - I think it's fine to remove).




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux