From 77e23755012f8f44cf3d76df341144bfed95a89d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 6 May 2021 14:38:48 -0700 Subject: [PATCH] net/dns: don't try to configure LLMNR or mdns in NetworkManager. Fixes #1870. Signed-off-by: David Anderson --- net/dns/nm.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/dns/nm.go b/net/dns/nm.go index ea8fad4c1..f5b9ce4b1 100644 --- a/net/dns/nm.go +++ b/net/dns/nm.go @@ -175,9 +175,12 @@ func (m *nmManager) trySet(ctx context.Context, config OSConfig) error { search = append(search, "~.") } - general := settings["connection"] - general["llmnr"] = dbus.MakeVariant(0) - general["mdns"] = dbus.MakeVariant(0) + // Ideally we would like to disable LLMNR and mdns on the + // interface here, but older NetworkManagers don't understand + // those settings and choke on them, so we don't. Both LLMNR and + // mdns will fail since tailscale0 doesn't do multicast, so it's + // effectively fine. We used to try and enforce LLMNR and mdns + // settings here, but that led to #1870. ipv4Map := settings["ipv4"] ipv4Map["dns"] = dbus.MakeVariant(dnsv4)