TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: return early, outdent a bunch in dnsConfigForNetmap

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-09-07 14:56:45 -07:00
parent 2bb0eb5f7e
commit 30a614f9b9
1 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipn/ipnlocal/local.go
View File

@ -1838,7 +1838,10 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, prefs *ipn.Prefs, logf logger.Log
dcfg.Hosts[fqdn] = append(dcfg.Hosts[fqdn], ip) dcfg.Hosts[fqdn] = append(dcfg.Hosts[fqdn], ip)
} }
if prefs.CorpDNS { if !prefs.CorpDNS {
return dcfg
}
addDefault := func(resolvers []dnstype.Resolver) { addDefault := func(resolvers []dnstype.Resolver) {
for _, r := range resolvers { for _, r := range resolvers {
dcfg.DefaultResolvers = append(dcfg.DefaultResolvers, normalizeResolver(r)) dcfg.DefaultResolvers = append(dcfg.DefaultResolvers, normalizeResolver(r))
@ -1905,7 +1908,7 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, prefs *ipn.Prefs, logf logger.Log
// We don't support split DNS at all on Android yet. // We don't support split DNS at all on Android yet.
addDefault(nm.DNS.FallbackResolvers) addDefault(nm.DNS.FallbackResolvers)
} }
}
return dcfg return dcfg
} }