Merge pull request #1784 from stgraber/vet

Fix some `go  vet` warnings

Author: hallyn

cmd/incusd/main_forknet.go

@@ -427,8 +427,6 @@ func (c *cmdForknet) RunDHCP(cmd *cobra.Command, args []string) error {
 
 		lease = newLease
 	}
-
-	return nil
 }
 
 func (c *cmdForknet) RunDetach(cmd *cobra.Command, args []string) error {

internal/server/dns/handler.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/miekg/dns"
@@ -15,13 +14,12 @@ import (
 
 type dnsHandler struct {
 	server *Server
-	mu     sync.Mutex
 }
 
 func (d dnsHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	// Don't allow concurent queries.
-	d.mu.Lock()
-	defer d.mu.Unlock()
+	d.server.mu.Lock()
+	defer d.server.mu.Unlock()
 
 	// Check if we're ready to serve queries.
 	if d.server.zoneRetriever == nil {