Commit 139bc2c6 authored by Michał Kępień's avatar Michał Kępień Committed by Witold Krecicki
Browse files

Release all resources when shutting down an RPZ zone during an update

If an RPZ zone is to be freed during an update, canceling the
update_quantum() event is not enough because the resources released when
an update completes also need to be accounted for.  Failure to do this
results in a hang upon shutdown.  Fix by copying cleanup code from the
end of update_quantum() to rpz_detach().
parent faf2c771
......@@ -2112,6 +2112,14 @@ rpz_detach(dns_rpz_zone_t **rpzp, dns_rpz_zones_t *rpzs) {
if (rpz->updaterunning) {
isc_task_purgeevent(rpz->rpzs->updater, &rpz->updateevent);
if (rpz->updbit != NULL) {
if (rpz->newnodes != NULL) {
dns_db_closeversion(rpz->updb, &rpz->updbversion, false);
isc_timer_reset(rpz->updatetimer, isc_timertype_inactive,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment