diff --git a/app.go b/app.go index 0442fb19..864ae16a 100644 --- a/app.go +++ b/app.go @@ -114,7 +114,7 @@ func NewHeadscale(cfg Config) (*Headscale, error) { return nil, err } h.cfg.DNSConfig.Routes = make(map[string][]dnstype.Resolver) - for _, d := range *magicDNSDomains { + for _, d := range magicDNSDomains { h.cfg.DNSConfig.Routes[d.WithoutTrailingDot()] = nil } } diff --git a/dns.go b/dns.go index 9826a414..353e10be 100644 --- a/dns.go +++ b/dns.go @@ -28,7 +28,7 @@ import ( // From the netmask we can find out the wildcard bits (the bits that are not set in the netmask). // This allows us to then calculate the subnets included in the subsequent class block and generate the entries. -func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) (*[]dnsname.FQDN, error) { +func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) ([]dnsname.FQDN, error) { base, err := dnsname.ToFQDN(baseDomain) if err != nil { return nil, err @@ -69,5 +69,5 @@ func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) ( } fqdns = append(fqdns, fqdn) } - return &fqdns, nil + return fqdns, nil } diff --git a/dns_test.go b/dns_test.go index 542674a9..87813203 100644 --- a/dns_test.go +++ b/dns_test.go @@ -11,7 +11,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) { c.Assert(err, check.IsNil) found := false - for _, domain := range *domains { + for _, domain := range domains { if domain == "64.100.in-addr.arpa." { found = true break @@ -20,7 +20,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) { c.Assert(found, check.Equals, true) found = false - for _, domain := range *domains { + for _, domain := range domains { if domain == "100.100.in-addr.arpa." { found = true break @@ -29,7 +29,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) { c.Assert(found, check.Equals, true) found = false - for _, domain := range *domains { + for _, domain := range domains { if domain == "127.100.in-addr.arpa." { found = true break @@ -44,7 +44,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) { c.Assert(err, check.IsNil) found := false - for _, domain := range *domains { + for _, domain := range domains { if domain == "0.16.172.in-addr.arpa." { found = true break @@ -53,7 +53,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) { c.Assert(found, check.Equals, true) found = false - for _, domain := range *domains { + for _, domain := range domains { if domain == "255.16.172.in-addr.arpa." { found = true break