eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

domains/restricted_nameservers: check dnsConfig.Resolvers instead of dnsConfig.Nameservers

Browse source
This commit is contained in:
John Axel Eriksson 2022-12-27 17:37:13 +01:00 • committed by Juan Font
parent 549b82df11
commit 7bb6f1a7eb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config.go
View file

@ -408,7 +408,7 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
} }
if viper.IsSet("dns_config.restricted_nameservers") { if viper.IsSet("dns_config.restricted_nameservers") {
if len(dnsConfig.Nameservers) > 0 { if len(dnsConfig.Resolvers) > 0 {
dnsConfig.Routes = make(map[string][]*dnstype.Resolver) dnsConfig.Routes = make(map[string][]*dnstype.Resolver)
restrictedDNS := viper.GetStringMapStringSlice( restrictedDNS := viper.GetStringMapStringSlice(
"dns_config.restricted_nameservers", "dns_config.restricted_nameservers",
@ -440,7 +440,7 @@ func GetDNSConfig() (*tailcfg.DNSConfig, string) {
if viper.IsSet("dns_config.domains") { if viper.IsSet("dns_config.domains") {
domains := viper.GetStringSlice("dns_config.domains") domains := viper.GetStringSlice("dns_config.domains")
if len(dnsConfig.Nameservers) > 0 { if len(dnsConfig.Resolvers) > 0 {
dnsConfig.Domains = domains dnsConfig.Domains = domains
} else if domains != nil { } else if domains != nil {
log.Warn(). log.Warn().