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

Merge branch '1092-allow-priming-glue-v9_11' into 'v9_11'

Browse Source 
allow glue in authoritative responses to root priming queries

See merge request isc-projects/bind9!2095
This commit is contained in:
Evan Hunt
2019-06-26 13:12:38 -04:00
parent d944201cf7 7cbb589795
commit 77bc37b616
10 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+4
View File
@@ -1,3 +1,7 @@
5256. [bug] Ensure that glue records are included in root
priming responses if "minimal-responses" is not
set to "yes". [GL #1092]
5255. [bug] Errors encountered while reloading inline-signing
zones could be ignored, causing the zone content to
be left in an incompletely updated state rather than
bin/named/query.c
+7 -1
View File
@@ -9028,11 +9028,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
}
/*
* BIND 8 priming queries need the additional section.
* Always add glue for root priming queries, regardless
* of "minimal-responses" setting.
*/
if (dns_name_equal(client->query.qname, dns_rootname)) {
client->query.attributes &=
~NS_QUERYATTR_NOADDITIONAL;
dns_db_attach(db, &client->query.gluedb);
}
}
@@ -9184,6 +9186,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
free_devent(client, ISC_EVENT_PTR(&event), &event);
}
if (client->query.gluedb != NULL) {
dns_db_detach(&client->query.gluedb);
}
/*
* AA bit.
*/
bin/tests/system/additional/ns1/named1.conf.in
+5
View File
@@ -29,6 +29,11 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {
type master;
file "root.db";
};
zone "rt.example" {
type master;
file "rt.db";
bin/tests/system/additional/ns1/named2.conf.in
+5
View File
@@ -29,6 +29,11 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {
type master;
file "root.db";
};
zone "rt.example" {
type master;
file "rt.db";
bin/tests/system/additional/ns1/named3.conf.in
+5
View File
@@ -30,6 +30,11 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {
type master;
file "root.db";
};
zone "rt.example" {
type master;
file "rt.db";
bin/tests/system/additional/ns1/named4.conf.in
+5
View File
@@ -29,6 +29,11 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {
type master;
file "root.db";
};
zone "mx.example" {
type master;
file "mx.db";
bin/tests/system/additional/ns1/root.db
+19
View File
@@ -0,0 +1,19 @@
; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
;
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;
; See the COPYRIGHT file distributed with this work for additional
; information regarding copyright ownership.
. IN SOA ns2. hostmaster ( 2 8H 2H 4W 1D);
. NS ns1.rt.example.
. NS ns2.rt.example.
ns1.rt.example. A 10.53.0.1
ns2.rt.example. A 10.53.0.2
rt.example. NS ns1.
naptr.example. NS ns1.
rt2.example. NS ns1.
naptr2.example. NS ns1.
nid.example. NS ns1.
bin/tests/system/additional/tests.sh
+32
View File
@@ -210,6 +210,38 @@ dotests() {
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
fi
n=`expr $n + 1`
echo_i "test with NS, root zone ($n)"
ret=0
$DIG $DIGOPTS -t NS . @10.53.0.1 > dig.out.$n || ret=1
# Always expect glue for root priming queries, regardless $minimal
grep 'ADDITIONAL: 3' dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
fi
n=`expr $n + 1`
echo_i "test with NS, non-root zone ($n)"
ret=0
$DIG $DIGOPTS -t NS rt.example @10.53.0.1 > dig.out.$n || ret=1
case $minimal in
yes)
grep 'ADDITIONAL: 1' dig.out.$n > /dev/null || ret=1
;;
no)
grep 'ADDITIONAL: 2' dig.out.$n > /dev/null || ret=1
;;
no-auth)
grep 'ADDITIONAL: 2' dig.out.$n > /dev/null || ret=1
;;
no-auth-recursive)
grep 'ADDITIONAL: 2' dig.out.$n > /dev/null || ret=1
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
fi
}
echo_i "testing with 'minimal-responses yes;'"
doc/arm/notes.xml
+11
View File
@@ -81,6 +81,17 @@
</itemizedlist>
</section>
<section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
<itemizedlist>
<listitem>
<para>
Glue address records were not being returned in responses
to root priming queries; this has been corrected. [GL #1092]
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="end_of_life"><info><title>End of Life</title></info>
<para>
BIND 9.11 (Extended Support Version) will be supported until at
util/copyrights
+1
View File
@@ -524,6 +524,7 @@
./bin/tests/system/additional/ns1/naptr.db ZONE 2013,2016,2018,2019
./bin/tests/system/additional/ns1/naptr2.db ZONE 2013,2016,2018,2019
./bin/tests/system/additional/ns1/nid.db ZONE 2013,2016,2018,2019
./bin/tests/system/additional/ns1/root.db ZONE 2019
./bin/tests/system/additional/ns1/rt.db ZONE 2013,2016,2018,2019
./bin/tests/system/additional/ns1/rt2.db ZONE 2013,2016,2018,2019
./bin/tests/system/additional/ns1/srv.db ZONE 2016,2018,2019