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

ipn/ipnlocal: only set authoritative domains when using MagicDNS. 

Otherwise, the existence of authoritative domains forces full
DNS proxying even when no other DNS config is present.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-04-20 15:52:19 -07:00
parent 53213114ec
commit 48d4f14652
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -1617,7 +1617,6 @@ func (b *LocalBackend) authReconfig() {
} }
dcfg.SearchDomains = append(dcfg.SearchDomains, fqdn) dcfg.SearchDomains = append(dcfg.SearchDomains, fqdn)
} }
dcfg.AuthoritativeSuffixes = magicDNSRootDomains(nm)
set := func(name string, addrs []netaddr.IPPrefix) { set := func(name string, addrs []netaddr.IPPrefix) {
if len(addrs) == 0 || name == "" { if len(addrs) == 0 || name == "" {
return return
@ -1633,6 +1632,7 @@ func (b *LocalBackend) authReconfig() {
dcfg.Hosts[fqdn] = ips dcfg.Hosts[fqdn] = ips
} }
if nm.DNS.Proxied { // actually means "enable MagicDNS" if nm.DNS.Proxied { // actually means "enable MagicDNS"
dcfg.AuthoritativeSuffixes = magicDNSRootDomains(nm)
dcfg.Hosts = map[dnsname.FQDN][]netaddr.IP{} dcfg.Hosts = map[dnsname.FQDN][]netaddr.IP{}
set(nm.Name, nm.Addresses) set(nm.Name, nm.Addresses)
for _, peer := range nm.Peers { for _, peer := range nm.Peers {