From 9f6257b046d99eaa0b8f6280fa392426da5e3aa0 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Sat, 9 May 2020 17:02:06 -0400
Subject: [PATCH] internal/dns: fix staticcheck issues

Signed-off-by: Matt Layher <mdlayher@gmail.com>
---
 internal/dns/dns.go      | 12 ++++++------
 internal/dns/dns_test.go |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/internal/dns/dns.go b/internal/dns/dns.go
index b48fbac..dc7d83d 100644
--- a/internal/dns/dns.go
+++ b/internal/dns/dns.go
@@ -327,7 +327,7 @@ func isLocalInAddrArpa(q string) bool {
 	return local
 }
 
-var sentinelEmpty = errors.New("no answers")
+var errEmpty = errors.New("no answers")
 
 func (s *Server) resolve(q dns.Question) (rr dns.RR, err error) {
 	if q.Qclass != dns.ClassINET {
@@ -350,7 +350,7 @@ func (s *Server) resolve(q dns.Question) (rr dns.RR, err error) {
 			if q.Qtype == dns.TypeA {
 				return dns.NewRR(q.Name + " 3600 IN A " + host)
 			}
-			return nil, sentinelEmpty
+			return nil, errEmpty
 		}
 	}
 	if q.Qtype == dns.TypePTR {
@@ -373,7 +373,7 @@ func (s *Server) handleInternal(w dns.ResponseWriter, r *dns.Msg) {
 	}
 	rr, err := s.resolve(r.Question[0])
 	if err != nil {
-		if err == sentinelEmpty {
+		if err == errEmpty {
 			m := new(dns.Msg)
 			m.SetReply(r)
 			w.WriteMsg(m)
@@ -457,7 +457,7 @@ func (s *Server) resolveSubname(hostname string, q dns.Question) (dns.RR, error)
 			if q.Qtype == dns.TypeA {
 				return dns.NewRR(q.Name + " 3600 IN A " + host)
 			}
-			return nil, sentinelEmpty
+			return nil, errEmpty
 		}
 
 		if ip, ok := s.subname(hostname, name); ok {
@@ -467,7 +467,7 @@ func (s *Server) resolveSubname(hostname string, q dns.Question) (dns.RR, error)
 			if q.Qtype == dns.TypeAAAA && ip.To4() == nil {
 				return dns.NewRR(q.Name + " 3600 IN AAAA " + ip.String())
 			}
-			return nil, sentinelEmpty
+			return nil, errEmpty
 		}
 	}
 	return nil, nil
@@ -481,7 +481,7 @@ func (s *Server) subnameHandler(hostname string) func(w dns.ResponseWriter, r *d
 
 		rr, err := s.resolveSubname(hostname, r.Question[0])
 		if err != nil {
-			if err == sentinelEmpty {
+			if err == errEmpty {
 				m := new(dns.Msg)
 				m.SetReply(r)
 				w.WriteMsg(m)
diff --git a/internal/dns/dns_test.go b/internal/dns/dns_test.go
index c278cab..7700716 100644
--- a/internal/dns/dns_test.go
+++ b/internal/dns/dns_test.go
@@ -15,7 +15,6 @@
 package dns
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -412,7 +411,7 @@ func TestLocalhost(t *testing.T) {
 		if _, ok := a.(*dns.AAAA); !ok {
 			t.Fatalf("unexpected response type: got %T, want dns.A", a)
 		}
-		if got, want := a.(*dns.AAAA).AAAA, (net.ParseIP("::1")); !bytes.Equal(got, want) {
+		if got, want := a.(*dns.AAAA).AAAA, (net.ParseIP("::1")); !got.Equal(want) {
 			t.Fatalf("unexpected response IP: got %v, want %v", got, want)
 		}
 	})