diff options
| author | Avery Pennarun <apenwarr@tailscale.com> | 2021-04-30 04:40:37 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@tailscale.com> | 2021-04-30 06:16:58 -0400 |
| commit | ecdba913d0b045e44a0d507e3cbc528d2d976a16 (patch) | |
| tree | c400847bfe0765e1258547a02469ed8fc24ec6b0 | |
| parent | 5e9e11a77de8ca8d2d40a25f3a12808b3404db6f (diff) | |
| download | tailscale-ecdba913d0b045e44a0d507e3cbc528d2d976a16.tar.xz tailscale-ecdba913d0b045e44a0d507e3cbc528d2d976a16.zip | |
Revert "ipn/ipnlocal: be authoritative for the entire MagicDNS record tree."
Unfortunately this broke MagicDNS almost entirely.
Updates: tailscale/corp#1706
This reverts commit 1d7e7b49eb8e16c31e41420deff527671a87dc0c.
| -rw-r--r-- | ipn/ipnlocal/local.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 99fa195be..e2b6cb22b 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -1897,12 +1897,6 @@ func magicDNSRootDomains(nm *netmap.NetworkMap) []dnsname.FQDN { // TODO: propagate error return nil } - if strings.HasSuffix(fqdn.WithoutTrailingDot(), ".beta.tailscale.net") { - // When using our standard MagicDNS suffix, make ourselves - // authoritative for all of tailscale.net, so that we - // become the resolver for shared nodes as well. - fqdn = dnsname.FQDN("tailscale.net.") - } ret := []dnsname.FQDN{ fqdn, dnsname.FQDN("0.e.1.a.c.5.1.1.a.7.d.f.ip6.arpa."), |