From b74a8994ca67fbe78ae1af0972b9dcade3f09485 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 8 Apr 2021 22:02:50 -0700 Subject: [PATCH] net/dns: make FQDN dot style consistent in more places. Signed-off-by: David Anderson --- net/dns/config.go | 5 +++-- net/dns/manager.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net/dns/config.go b/net/dns/config.go index aff502331..48abebe0a 100644 --- a/net/dns/config.go +++ b/net/dns/config.go @@ -6,6 +6,7 @@ package dns import ( "sort" + "strings" "inet.af/netaddr" ) @@ -91,14 +92,14 @@ func (c Config) matchDomains() []string { if seen[suffix] { continue } - ret = append(ret, suffix) + ret = append(ret, strings.TrimSuffix(suffix, ".")) seen[suffix] = true } for suffix := range c.Routes { if seen[suffix] { continue } - ret = append(ret, suffix) + ret = append(ret, strings.TrimSuffix(suffix, ".")) seen[suffix] = true } sort.Strings(ret) diff --git a/net/dns/manager.go b/net/dns/manager.go index cf0b0412b..04589bd67 100644 --- a/net/dns/manager.go +++ b/net/dns/manager.go @@ -154,7 +154,7 @@ func (m *Manager) compileConfig(cfg Config) (resolver.Config, OSConfig, error) { LocalDomains: addFQDNDots(cfg.AuthoritativeSuffixes), } for suffix, resolvers := range cfg.Routes { - rcfg.Routes[suffix+"."] = resolvers + rcfg.Routes[suffix] = resolvers } ocfg = OSConfig{ Nameservers: []netaddr.IP{tsaddr.TailscaleServiceIP()},