ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4015. [bug] Nameservers that are skipped due to them being

Browse Source 
CNAMEs were not being logged. They are now logged
                        to category 'cname' as per BIND 8. [RT #37935]
This commit is contained in:
Mark Andrews
2014-12-03 11:34:07 +11:00
parent 6a4406fcb5
commit ea3aa401bc
13 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/resolver/ns4/root.db
View File

@@ -24,3 +24,4 @@ $TTL 300
)
. NS a.root-servers.nil.
a.root-servers.nil. A 10.53.0.4
all-cnames NS cname.tld

3
bin/tests/system/resolver/ns4/tld1.db
View File

@@ -32,4 +32,5 @@ no-edns-version.tld. NS ns.no-edns-version.tld.
ns.no-edns-version.tld. A 10.53.0.6
edns-version.tld. NS ns.edns-version.tld.
ns.edns-version.tld. A 10.53.0.7
cname CNAME ns7
ns7 A 10.53.0.7

2
bin/tests/system/resolver/ns4/tld2.db
View File

@@ -32,3 +32,5 @@ no-edns-version.tld. NS ns.no-edns-version.tld.
ns.no-edns-version.tld. A 10.53.0.6
edns-version.tld. NS ns.edns-version.tld.
ns.edns-version.tld. A 10.53.0.7
cname CNAME ns7
ns7 A 10.53.0.7

23
bin/tests/system/resolver/ns7/all-cnames.db Normal file
View File

@@ -0,0 +1,23 @@
; Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$TTL 300
@ IN SOA marka.isc.org. ns.server. (
2010 ; serial
600 ; refresh
600 ; retry
1200 ; expire
600 ; minimum
)
@ NS cname.tld.

5
bin/tests/system/resolver/ns7/named1.conf
View File

@@ -57,3 +57,8 @@ zone "edns-version.tld" {
type master;
file "edns-version.tld.db";
};
zone "all-cnames" {
type master;
file "all-cnames.db";
};

5
bin/tests/system/resolver/ns7/named2.conf
View File

@@ -57,3 +57,8 @@ zone "edns-version.tld" {
type master;
file "edns-version.tld.db";
};
zone "all-cnames" {
type master;
file "all-cnames.db";
};

9
bin/tests/system/resolver/tests.sh
View File

@@ -527,5 +527,14 @@ if test ${edns:-0} != 0; then
status=`expr $status + $ret`
fi
n=`expr $n + 1`
echo "I:check that CNAME nameserver is logged correctly (${n})"
ret=0
$DIG soa all-cnames @10.53.0.5 -p 5300 > dig.out.ns5.test${n} || ret=1
grep "status: SERVFAIL" dig.out.ns5.test${n} > /dev/null || ret=1
grep "skipping nameserver 'cname.tld' because it is a CNAME, while resolving 'all-cnames/SOA'" ns5/named.run > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status