Fix merge problem

janeczku · Oct 18, 2015 · b997a2d · b997a2d
1 parent d572f59
commit b997a2d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/server/forwarding.go b/server/forwarding.go
@@ -122,11 +122,6 @@ Redo:
 			}
 			// Restore original question
 			r.Question[0] = reqOrig.Question[0]
-		} else if r.Rcode == dns.RcodeNameError && len(s.config.SearchDomains) > 0 {
-			// Got a NXDOMAIN reply for a multi-label qname
-			// Need to continue resolving it by qualifying the name with the search paths
-			searchFix = true
-			goto RedoSearch			
 		}
 
 		r.Compress = true