Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-12 23:12:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

middleware/file: include nsset in replies

Browse Source 
This is required so that a resolver can upade the referral NSset
with the NSset at the child.

Update tests as well.
This commit is contained in:
Miek Gieben
2016-12-07 20:37:29 +00:00
parent 56d3b47d11
commit 187e1dc512
6 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
middleware/file/lookup.go
View File

@@ -40,8 +40,7 @@ func (z *Zone) Lookup(state request.Request, qname string) ([]dns.RR, []dns.RR,
}()
if qtype == dns.TypeSOA {
soa := z.soa(do)
return soa, nil, nil, Success
return z.soa(do), z.ns(do), nil, Success
}
if qtype == dns.TypeNS && qname == z.origin {
nsrrs := z.ns(do)
@@ -146,7 +145,7 @@ func (z *Zone) Lookup(state request.Request, qname string) ([]dns.RR, []dns.RR,
rrs = append(rrs, sigs...)
}
return rrs, nil, nil, Success
return rrs, z.ns(do), nil, Success
}
@@ -154,7 +153,7 @@ func (z *Zone) Lookup(state request.Request, qname string) ([]dns.RR, []dns.RR,
// Found wildcard.
if wildElem != nil {
auth := []dns.RR{}
auth := z.ns(do)
if rrs := wildElem.Types(dns.TypeCNAME, qname); len(rrs) > 0 {
return z.searchCNAME(state, wildElem, rrs)
@@ -275,7 +274,7 @@ func (z *Zone) searchCNAME(state request.Request, elem *tree.Elem, rrs []dns.RR)
if !dns.IsSubDomain(z.origin, targetName) {
rrs = append(rrs, z.externalLookup(state, targetName, qtype)...)
}
return rrs, nil, nil, Success
return rrs, z.ns(do), nil, Success
}
i := 0
@@ -300,12 +299,12 @@ Redo:
rrs = append(rrs, z.externalLookup(state, targetName, qtype)...)
}
}
return rrs, nil, nil, Success
return rrs, z.ns(do), nil, Success
}
i++
if i > maxChain {
return rrs, nil, nil, Success
return rrs, z.ns(do), nil, Success
}
goto Redo
@@ -324,7 +323,7 @@ Redo:
}
}
return rrs, nil, nil, Success
return rrs, z.ns(do), nil, Success
}
func cnameForType(targets []dns.RR, origQtype uint16) []dns.RR {