lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipn/ipnlocal: allow setting MagicDNS without DefaultResolvers. 

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/1673/head
David Anderson 2021-04-08 16:23:33 -07:00
parent fad21af01c
commit 2f398106e2
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipn/ipnlocal/local.go
View File

@ -1523,12 +1523,7 @@ func (b *LocalBackend) authReconfig() {
} }
dcfg.Hosts[name] = ips dcfg.Hosts[name] = ips
} }
enableMagicDNS := nm.DNS.Proxied if nm.DNS.Proxied { // actually means "enable MagicDNS"
if enableMagicDNS && len(nm.DNS.Resolvers) == 0 {
b.logf("[unexpected] dns proxied but no nameservers")
enableMagicDNS = false
}
if enableMagicDNS {
dcfg.Hosts = map[string][]netaddr.IP{} dcfg.Hosts = map[string][]netaddr.IP{}
set(nm.Name, nm.Addresses) set(nm.Name, nm.Addresses)
for _, peer := range nm.Peers { for _, peer := range nm.Peers {