mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-03-27 08:12:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

net/dns: fix duplicate search line entries (OpenBSD, primarily)

Browse Source 
Fixes #12360

Signed-off-by: Greg Steuck <greg@nest.cx>
This commit is contained in:
Greg Steuck 2026-03-25 10:19:02 -07:00 committed by GitHub
parent 4f43ad3042
commit 954a2dfd31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dns/manager.go
View File

@ -431,7 +431,14 @@ func (m *Manager) compileConfig(cfg Config) (rcfg resolver.Config, ocfg OSConfig
defaultRoutes = append(defaultRoutes, &dnstype.Resolver{Addr: ip.String()})
}
rcfg.Routes["."] = defaultRoutes
ocfg.SearchDomains = append(ocfg.SearchDomains, baseCfg.SearchDomains...)
// Append base config search domains, but only if not already present.
// This prevents duplicates when GetBaseConfig() reads back domains that
// Tailscale itself previously wrote to resolv.conf.
for _, domain := range baseCfg.SearchDomains {
if !slices.Contains(ocfg.SearchDomains, domain) {
ocfg.SearchDomains = append(ocfg.SearchDomains, domain)
}
}
}
return rcfg, ocfg, nil