Revert "Ensure the correct ordering zone_shutdown() vs zone_gotwritehandle()"

This reverts commit cc1d4e1aa63fdc7e82a00fd7b06d50fb4dbc8e96.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2241f9908944796582deaf743669bc4c4e2564ed..2e54038b3cf6585bd0c9da08025192c96d958084 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -11947,9 +11947,6 @@ dump_done(void *arg, isc_result_t result) {
                dns_dumpctx_detach(&zone->dctx);
        }
        zonemgr_putio(&zone->writeio);
-       if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_SHUTDOWN) && zone->raw != NULL) {
-               dns_zone_detach(&zone->raw);
-       }
        UNLOCK_ZONE(zone);
        if (again) {
                (void)zone_dump(zone, false);
@@ -15031,7 +15028,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
         */
        DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_SHUTDOWN);
        free_needed = exit_check(zone);
-       if (inline_secure(zone) && !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) {
+       if (inline_secure(zone)) {
                raw = zone->raw;
                zone->raw = NULL;
        }