Merge branch '1608-catz-reconfig-crash-fix-v9_16' into 'v9_16'
[v9_16] Fix catalog zone reconfiguration crash See merge request isc-projects/bind9!5608
This commit is contained in:
@@ -3,6 +3,10 @@
|
||||
5764. [bug] dns_sdlz_putrr failed to process some valid resource
|
||||
records. [GL #3021]
|
||||
|
||||
5762. [bug] Fix a "named" crash related to removing and restoring a
|
||||
`catalog-zone` entry in the configuration file and
|
||||
running `rndc reconfig`. [GL #1608]
|
||||
|
||||
5758. [bug] mdig now honors the operating system's preferred
|
||||
ephemeral port range. [GL #2374]
|
||||
|
||||
|
||||
@@ -6523,6 +6523,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
|
||||
|
||||
if (zone_is_catz) {
|
||||
dns_zone_catz_enable(zone, view->catzs);
|
||||
} else if (dns_zone_catz_is_enabled(zone)) {
|
||||
dns_zone_catz_disable(zone);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
include "../../common/rndc.key";
|
||||
|
||||
controls {
|
||||
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
|
||||
};
|
||||
|
||||
options {
|
||||
query-source address 10.53.0.2;
|
||||
notify-source 10.53.0.2;
|
||||
transfer-source 10.53.0.2;
|
||||
port @PORT@;
|
||||
pid-file "named.pid";
|
||||
listen-on { 10.53.0.2; };
|
||||
listen-on-v6 { fd92:7065:b8e:ffff::2; };
|
||||
notify no;
|
||||
recursion no;
|
||||
serial-query-rate 100;
|
||||
# removed catalog-zone option, otherwise this is
|
||||
# identical to named1.conf.in
|
||||
};
|
||||
|
||||
zone "catalog1.example" {
|
||||
type secondary;
|
||||
file "catalog1.example.db";
|
||||
primaries { 10.53.0.1; };
|
||||
};
|
||||
|
||||
zone "catalog2.example" {
|
||||
type secondary;
|
||||
file "catalog2.example.db";
|
||||
primaries { 10.53.0.3; };
|
||||
};
|
||||
|
||||
zone "catalog3.example" {
|
||||
type secondary;
|
||||
file "catalog3.example.db";
|
||||
primaries { 10.53.0.1; };
|
||||
};
|
||||
|
||||
zone "catalog4.example" {
|
||||
type secondary;
|
||||
file "catalog4.example.db";
|
||||
primaries { 10.53.0.1; };
|
||||
};
|
||||
|
||||
key tsig_key. {
|
||||
secret "LSAnCU+Z";
|
||||
algorithm hmac-md5;
|
||||
};
|
||||
@@ -15,7 +15,7 @@ SYSTEMTESTTOP=..
|
||||
$SHELL clean.sh
|
||||
|
||||
copy_setports ns1/named.conf.in ns1/named.conf
|
||||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
copy_setports ns3/named.conf.in ns3/named.conf
|
||||
|
||||
cp -f ns1/catalog.example.db.in ns1/catalog1.example.db
|
||||
|
||||
@@ -1179,7 +1179,7 @@ status=$((status+ret))
|
||||
n=$((n+1))
|
||||
echo_i "reconfiguring secondary - adding catalog4 catalog zone ($n)"
|
||||
ret=0
|
||||
sed -e "s/^#T1//g" < ns2/named.conf.in > ns2/named.conf.tmp
|
||||
sed -e "s/^#T1//g" < ns2/named1.conf.in > ns2/named.conf.tmp
|
||||
copy_setports ns2/named.conf.tmp ns2/named.conf
|
||||
rndccmd 10.53.0.2 reconfig || ret=1
|
||||
if [ $ret -ne 0 ]; then echo_i "failed"; fi
|
||||
@@ -1210,7 +1210,7 @@ status=$((status+ret))
|
||||
n=$((n+1))
|
||||
echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-existent catalog5 catalog zone ($n)"
|
||||
ret=0
|
||||
sed -e "s/^#T2//" < ns2/named.conf.in > ns2/named.conf.tmp
|
||||
sed -e "s/^#T2//" < ns2/named1.conf.in > ns2/named.conf.tmp
|
||||
copy_setports ns2/named.conf.tmp ns2/named.conf
|
||||
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reconfig > /dev/null 2>&1 && ret=1
|
||||
if [ $ret -ne 0 ]; then echo_i "failed"; fi
|
||||
@@ -1219,7 +1219,7 @@ status=$((status+ret))
|
||||
n=$((n+1))
|
||||
echo_i "reconfiguring secondary - removing non-existent catalog5 catalog zone ($n)"
|
||||
ret=0
|
||||
copy_setports ns2/named.conf.in ns2/named.conf
|
||||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
rndccmd 10.53.0.2 reconfig || ret=1
|
||||
if [ $ret -ne 0 ]; then echo_i "failed"; fi
|
||||
status=$((status+ret))
|
||||
@@ -1730,5 +1730,15 @@ wait_for_no_soa @10.53.0.2 dom16.example. dig.out.test$n || ret=1
|
||||
if [ $ret -ne 0 ]; then echo_i "failed"; fi
|
||||
status=$((status+ret))
|
||||
|
||||
n=$((n+1))
|
||||
echo_i "checking that reconfig can delete and restore catalog zone configuration ($n)"
|
||||
ret=0
|
||||
copy_setports ns2/named2.conf.in ns2/named.conf
|
||||
rndccmd 10.53.0.2 reconfig || ret=1
|
||||
copy_setports ns2/named1.conf.in ns2/named.conf
|
||||
rndccmd 10.53.0.2 reconfig || ret=1
|
||||
if [ $ret -ne 0 ]; then echo_i "failed"; fi
|
||||
status=$((status+ret))
|
||||
|
||||
echo_i "exit status: $status"
|
||||
[ $status -eq 0 ] || exit 1
|
||||
|
||||
@@ -39,4 +39,7 @@ Feature Changes
|
||||
Bug Fixes
|
||||
~~~~~~~~~
|
||||
|
||||
- None.
|
||||
- Removing a configured ``catalog-zone`` clause from the configuration, running
|
||||
``rndc reconfig``, then bringing back the removed ``catalog-zone`` clause and
|
||||
running ``rndc reconfig`` again caused ``named`` to crash. This has been fixed.
|
||||
:gl:`#1608`
|
||||
|
||||
@@ -2605,6 +2605,26 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs);
|
||||
* \li prior to calling, zone->catzs is NULL or is equal to 'catzs'
|
||||
*/
|
||||
|
||||
void
|
||||
dns_zone_catz_disable(dns_zone_t *zone);
|
||||
/*%<
|
||||
* Disable zone as catalog zone, if it is one.
|
||||
*
|
||||
* Requires:
|
||||
*
|
||||
* \li 'zone' is a valid zone object
|
||||
*/
|
||||
|
||||
bool
|
||||
dns_zone_catz_is_enabled(dns_zone_t *zone);
|
||||
/*%<
|
||||
* Return a boolean indicating whether the zone is enabled as catalog zone.
|
||||
*
|
||||
* Requires:
|
||||
*
|
||||
* \li 'zone' is a valid zone object
|
||||
*/
|
||||
|
||||
void
|
||||
dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db);
|
||||
/*%<
|
||||
|
||||
@@ -1173,8 +1173,10 @@ dns_xfrin_shutdown
|
||||
dns_zone_addnsec3chain
|
||||
dns_zone_asyncload
|
||||
dns_zone_attach
|
||||
dns_zone_catz_disable
|
||||
dns_zone_catz_enable
|
||||
dns_zone_catz_enable_db
|
||||
dns_zone_catz_is_enabled
|
||||
dns_zone_cdscheck
|
||||
dns_zone_checknames
|
||||
dns_zone_clearforwardacl
|
||||
|
||||
@@ -1942,6 +1942,24 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) {
|
||||
UNLOCK_ZONE(zone);
|
||||
}
|
||||
|
||||
void
|
||||
dns_zone_catz_disable(dns_zone_t *zone) {
|
||||
REQUIRE(DNS_ZONE_VALID(zone));
|
||||
|
||||
LOCK_ZONE(zone);
|
||||
if (zone->catzs != NULL) {
|
||||
dns_catz_catzs_detach(&zone->catzs);
|
||||
}
|
||||
UNLOCK_ZONE(zone);
|
||||
}
|
||||
|
||||
bool
|
||||
dns_zone_catz_is_enabled(dns_zone_t *zone) {
|
||||
REQUIRE(DNS_ZONE_VALID(zone));
|
||||
|
||||
return (zone->catzs != NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* If a zone is a catalog zone, attach it to update notification in database.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user