upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 15:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

3981. [bug] Cache DS/NXDOMAIN independently of other query types.

Browse source 
[RT #37467]

(cherry picked from commit 72775a79fe)
This commit is contained in:
Mark Andrews 2014-10-18 13:09:09 +11:00
parent 7b4063bd24
commit f2b44f6586
5 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
3981. [bug] Cache DS/NXDOMAIN independently of other query types.
[RT #37467]
3978. [test] Added a unit test for Diffie-Hellman key
computation, completing change #3974. [RT #37477]

5
bin/tests/system/forward/ns2/named.conf
View file

@ -55,6 +55,11 @@ zone "example4." {
file "example.db";
};
zone "grafted." {
type master;
file "example.db";
};
zone "1.0.10.in-addr.arpa." {
type master;
file "example.db";

6
bin/tests/system/forward/ns4/named.conf
View file

@ -56,3 +56,9 @@ zone "1.0.10.in-addr.arpa" {
forward only;
forwarders { 10.53.0.2; };
};
zone "grafted" {
type forward;
forward only;
forwarders { 10.53.0.2; };
};

13
bin/tests/system/forward/tests.sh
View file

@ -110,5 +110,18 @@ grep "status: NXDOMAIN" dig.out.f2 > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:checking that DS lookups for grafting forward zones are isolated"
ret=0
$DIG grafted A @10.53.0.4 -p 5300 > dig.out.q1
$DIG grafted DS @10.53.0.4 -p 5300 > dig.out.q2
$DIG grafted A @10.53.0.4 -p 5300 > dig.out.q3
$DIG grafted AAAA @10.53.0.4 -p 5300 > dig.out.q4
grep "status: NOERROR" dig.out.q1 > /dev/null || ret=1
grep "status: NXDOMAIN" dig.out.q2 > /dev/null || ret=1
grep "status: NOERROR" dig.out.q3 > /dev/null || ret=1
grep "status: NOERROR" dig.out.q4 > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status

13
lib/dns/resolver.c
View file

@ -4192,7 +4192,11 @@ validated(isc_task_t *task, isc_event_t *event) {
inc_stats(res, dns_resstatscounter_valnegsuccess);
if (fctx->rmessage->rcode == dns_rcode_nxdomain)
/*
* Cache DS NXDOMAIN seperately to other types.
*/
if (fctx->rmessage->rcode == dns_rcode_nxdomain &&
fctx->type != dns_rdatatype_ds)
covers = dns_rdatatype_any;
else
covers = fctx->type;
@ -7425,7 +7429,12 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
*/
if (WANTNCACHE(fctx)) {
dns_rdatatype_t covers;
if (message->rcode == dns_rcode_nxdomain)
/*
* Cache DS NXDOMAIN seperately to other types.
*/
if (message->rcode == dns_rcode_nxdomain &&
fctx->type != dns_rdatatype_ds)
covers = dns_rdatatype_any;
else
covers = fctx->type;