From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 9 May 2024 14:16:57 +0000 (+0200)
Subject: network: Register dnsmasq with resolved only when really requested
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dda10ac8acd0b5ffa03f9659c5678c2bddd9eed4;p=libvirt.git

network: Register dnsmasq with resolved only when really requested

An incorrect check for domainRegister caused the DNS server for a
virtual domain to be registered with systemd-resolved even if
register='no' attribute was present. Only omitting the attribute
completely would disable the registration.

Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index d89700c6ee..e5f9ecf9e8 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2016,7 +2016,9 @@ networkStartNetworkVirtual(virNetworkDriverState *driver,
 
         dnsmasqStarted = true;
 
-        if (def->domain && def->domainRegister && dnsServer) {
+        if (def->domain &&
+            def->domainRegister == VIR_TRISTATE_BOOL_YES &&
+            dnsServer) {
             unsigned int link;
             int rc;