From 52a89a318aecc534a6a30109339c86debc65dec4 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Mon, 11 May 2015 02:44:15 +0100
Subject: [PATCH] cosmetic: resolve yet more linter complaints

---
 nameserver/server.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nameserver/server.go b/nameserver/server.go
index 0ec71e76..3077c8f4 100644
--- a/nameserver/server.go
+++ b/nameserver/server.go
@@ -215,11 +215,11 @@ func (s *DNSServer) Stop() error {
 
 func (s *DNSServer) queryHandler(proto dnsProtocol) dns.HandlerFunc {
 	zoneLookup := func(lookup ZoneLookup, q *dns.Question, r *dns.Msg) (*dns.Msg, []ZoneRecord, error) {
-		if ips, err := lookup.LookupName(q.Name); err != nil {
+		ips, err := lookup.LookupName(q.Name)
+		if err != nil {
 			return nil, nil, err
-		} else {
-			return makeAddressReply(r, q, ips), ips, nil
 		}
+		return makeAddressReply(r, q, ips), ips, nil
 	}
 
 	fallback := func(w dns.ResponseWriter, r *dns.Msg) {
@@ -231,11 +231,11 @@ func (s *DNSServer) queryHandler(proto dnsProtocol) dns.HandlerFunc {
 
 func (s *DNSServer) rdnsHandler(proto dnsProtocol) dns.HandlerFunc {
 	zoneLookup := func(lookup ZoneLookup, q *dns.Question, r *dns.Msg) (*dns.Msg, []ZoneRecord, error) {
-		if names, err := lookup.LookupInaddr(q.Name); err != nil {
+		names, err := lookup.LookupInaddr(q.Name)
+		if err != nil {
 			return nil, nil, err
-		} else {
-			return makePTRReply(r, q, names), names, nil
 		}
+		return makePTRReply(r, q, names), names, nil
 	}
 
 	notUsHandler := s.notUsHandler(proto)