network: Register dnsmasq with resolved only when really requested

[PATCH] network: Register dnsmasq with resolved only when really requested

Jiri Denemark posted 1 patch 1 year, 8 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/815548ed7af8b9e0573fa4072bfcc17568aa67a5.1715264615.git.jdenemar@redhat.com

src/network/bridge_driver.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] network: Register dnsmasq with resolved only when really requested

Posted by Jiri Denemark 1 year, 8 months ago

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>
---
 src/network/bridge_driver.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
 
-- 
2.45.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Re: [PATCH] network: Register dnsmasq with resolved only when really requested

Posted by Daniel P. Berrangé 1 year, 8 months ago

On Thu, May 09, 2024 at 04:23:35PM +0200, Jiri Denemark wrote:
> 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>
> ---
>  src/network/bridge_driver.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org