diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 2e9966f8d0..0a317acee8 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -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 diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 3888f71252..e8f824359d 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -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; }