fix: usr: Fix response policy zones and catalog zones with an $INCLUD…

…E statement defined

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

Closes #5111

Merge branch '5111-includes-disable-rpz-and-catz-fix' into 'main'

See merge request isc-projects/bind9!9930

lib/dns/include/dns/master.h

@@ -175,7 +175,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

lib/dns/zone.c

@@ -2657,13 +2657,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;
 	}