mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/dns: don't try to configure LLMNR or mdns in NetworkManager. 

Fixes #1870.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-05-06 14:38:48 -07:00 committed by Dave Anderson
parent e78e26b6fb
commit 77e2375501
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dns/nm.go
View File

@ -175,9 +175,12 @@ func (m *nmManager) trySet(ctx context.Context, config OSConfig) error {
search = append(search, "~.") search = append(search, "~.")
} }
general := settings["connection"] // Ideally we would like to disable LLMNR and mdns on the
general["llmnr"] = dbus.MakeVariant(0) // interface here, but older NetworkManagers don't understand
general["mdns"] = dbus.MakeVariant(0) // 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 := settings["ipv4"]
ipv4Map["dns"] = dbus.MakeVariant(dnsv4) ipv4Map["dns"] = dbus.MakeVariant(dnsv4)