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

[9.20] fix: usr: Fix response policy zones and catalog zones with an $INCLUDE statement defined

Browse source 
Response policy zones (RPZ) and catalog zones were not working correctly if they had an $INCLUDE statement defined. This has been fixed.

Closes #5111

Backport of MR !9930

Merge branch 'backport-5111-includes-disable-rpz-and-catz-fix-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!9941
This commit is contained in:
Arаm Sаrgsyаn 2025-01-08 15:21:52 +00:00
commit cc0cbbe697
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dns/include/dns/master.h
View file

@ -179,7 +179,7 @@ dns_master_loadfileasync(const char *master_file, dns_name_t *top,
*
* Returns:
*\li ISC_R_SUCCESS upon successfully loading the master file.
*\li ISC_R_SEENINCLUDE upon successfully loading the master file with
*\li DNS_R_SEENINCLUDE upon successfully loading the master file with
* a $INCLUDE statement.
*\li ISC_R_NOMEMORY out of memory.
*\li ISC_R_UNEXPECTEDEND expected to be able to read a input token and

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;
}