Process db callbacks in zone_loaddone() after zone_postload()

The zone_postload() function can fail and unregister the callbacks.

Call dns_db_endload() only after calling zone_postload() to make
sure that the registered update-notify callbacks are not called
when the zone loading has failed during zone_postload().

Also, don't ignore the return value of zone_postload().

(cherry picked from commit ed268b46f11706bde3da68bd2a4b45752350f736)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 702f712160bf8b87aa55e9bae49ea109ac1e5e06..a5b7e1bf08eea98a32a3c1ad81150ab807df2840 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -17798,13 +17798,6 @@ zone_loaddone(void *arg, isc_result_t result) {
                dns_zone_catz_disable_db(zone, load->db);
        }
 
-       tresult = dns_db_endload(load->db, &load->callbacks);
-       if (tresult != ISC_R_SUCCESS &&
-           (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
-       {
-               result = tresult;
-       }
-
        /*
         * Lock hierarchy: zmgr, zone, raw.
         */
@@ -17823,10 +17816,14 @@ again:
                        goto again;
                }
        }
-       (void)zone_postload(zone, load->db, load->loadtime, result);
+       tresult = zone_postload(zone, load->db, load->loadtime, result);
+       if (tresult != ISC_R_SUCCESS &&
+           (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
+       {
+               result = tresult;
+       }
        zonemgr_putio(&zone->readio);
        DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADING);
-       zone_idetach(&load->callbacks.zone);
        /*
         * Leave the zone frozen if the reload fails.
         */
@@ -17843,7 +17840,14 @@ again:
        }
        UNLOCK_ZONE(zone);
 
+       (void)dns_db_endload(load->db, &load->callbacks);
+
+       LOCK_ZONE(zone);
+       zone_idetach(&load->callbacks.zone);
+       UNLOCK_ZONE(zone);
+
        load->magic = 0;
+
        dns_db_detach(&load->db);
        if (load->zone->lctx != NULL) {
                dns_loadctx_detach(&load->zone->lctx);