diff options
Diffstat (limited to 'middleware/file/lookup.go')
| -rw-r--r-- | middleware/file/lookup.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/middleware/file/lookup.go b/middleware/file/lookup.go index 34fb0252c..0e2c4cb80 100644 --- a/middleware/file/lookup.go +++ b/middleware/file/lookup.go @@ -25,13 +25,14 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR, } else { rr = mk() } - rr.Header().Rrtype = qtype // this is pretty nonobvious - if qtype == dns.TypeSOA { return z.lookupSOA(do) } + // Misuse rr to be a question. + rr.Header().Rrtype = qtype rr.Header().Name = qname + elem := z.Tree.Get(rr) if elem == nil { return z.nameError(elem, rr, do) @@ -47,6 +48,7 @@ func (z *Zone) Lookup(qname string, qtype uint16, do bool) ([]dns.RR, []dns.RR, if len(rrs) == 0 { return z.noData(elem, do) } + if do { sigs := elem.Types(dns.TypeRRSIG) sigs = signatureForSubType(sigs, qtype) @@ -69,7 +71,7 @@ func (z *Zone) nameError(elem *tree.Elem, rr dns.RR, do bool) ([]dns.RR, []dns.R return nil, ret, nil, Success } // NSECs! - return nil, []dns.RR{z.SOA}, nil, Success + return nil, []dns.RR{z.SOA}, nil, NameError } func (z *Zone) lookupSOA(do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) { @@ -94,7 +96,6 @@ func (z *Zone) lookupNSEC(elem *tree.Elem, do bool) []dns.RR { } } return nsec - } func (z *Zone) lookupCNAME(rrs []dns.RR, rr dns.RR, do bool) ([]dns.RR, []dns.RR, []dns.RR, Result) { |