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

Don't disable RPZ and CATZ for zones with an $INCLUDE statement

Browse source 
The code in zone_startload() disables RPZ and CATZ for a zone if
dns_master_loadfile() returns anything other than ISC_R_SUCCESS,
which makes sense, but it's an error because zone_startload() can
also return DNS_R_SEENINCLUDE upon success when the zone had an
$INCLUDE statement.

(cherry picked from commit 3d7a9fba3b)
This commit is contained in:
Aram Sargsyan 2024-12-25 14:30:53 +00:00 committed by Arаm Sаrgsyаn
parent 2d89dae589
commit 1c6a97055d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/dns/zone.c
View file

@ -2653,13 +2653,13 @@ zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) {
}
cleanup:
if (result != ISC_R_SUCCESS) {
if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE) {
dns_zone_rpz_disable_db(zone, load->db);
dns_zone_catz_disable_db(zone, load->db);
}
tresult = dns_db_endload(db, &load->callbacks);
if (result == ISC_R_SUCCESS) {
if (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE) {
result = tresult;
}