Merge pull request #1277 from weaveworks/1275-negative-dns
Return NXDOMAIN when we don't have entries and drop the non-authoritative special case for recursive dns. Fixes #1275.
This commit is contained in:
commit
755a949f6d
3 files changed
+17
-21
No files matched your search
+5
-5
@@ -134,6 +134,10 @@ func (d *DNSServer) handleLocal(defaultMaxResponseSize int) func(dns.ResponseWri
|
||||
}
|
||||
|
||||
addrs := d.ns.Lookup(hostname)
|
||||
if len(addrs) == 0 {
|
||||
d.errorResponse(req, dns.RcodeNameError, w)
|
||||
return
|
||||
}
|
||||
|
||||
response := dns.Msg{}
|
||||
response.RecursionAvailable = true
|
||||
@@ -233,12 +237,8 @@ func (d *DNSServer) handleRecursive(client *dns.Client, defaultMaxResponseSize i
|
||||
d.ns.debugf("error trying %s: %v", server, err)
|
||||
continue
|
||||
}
|
||||
if response.Rcode != dns.RcodeSuccess && !response.Authoritative {
|
||||
d.ns.debugf("non-authoritative error trying %s: %v", server, response.Rcode)
|
||||
continue
|
||||
}
|
||||
d.ns.debugf("response: %+v", response)
|
||||
response.SetReply(req)
|
||||
response.Id = req.Id
|
||||
if err := w.WriteMsg(response); err != nil {
|
||||
d.ns.infof("error responding: %v", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user