Fix a bug in zone_loaddone()

The zone_loaddone() function disables database notifications for
a catalog zones and response policy zones (RPZ) when loading had
failed. Howerer, the 'result != ISC_R_SUCCESS' check is insufficient,
because the DNS_R_SEENINCLUDE result also indicates success.

Add a second condition for the "if" block.

(cherry picked from commit 31290eccb1246cc1aefd8a062e36de12ca0f24e1)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ed515b590975c958deb2317d0d73a7c8395ffcbc..bf70dcdce87d1e388d0ca2f0456f29b9792c4220 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -18274,7 +18274,7 @@ zone_loaddone(void *arg, isc_result_t result) {
         * If zone loading failed, remove the update db callbacks prior
         * to calling the list of callbacks in the zone load structure.
         */
-       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);
        }