upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 21:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3866-fix-rpz-reference-counting-bug-v9_18' into 'v9_18'

Browse source 
[9.18] Fix RPZ reference counting error on shutdown

See merge request isc-projects/bind9!7531
This commit is contained in:
Arаm Sаrgsyаn 2023-02-14 12:28:31 +00:00
commit ebd49dc674
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6096. [bug] Fix RPZ reference counting error on shutdown in
dns__rpz_timer_cb(). [GL #3866]
6095. [test] Test various 'islands of trust' configurations when
using managed keys. [GL #3662]

3
lib/dns/rpz.c
View file

@ -1957,8 +1957,6 @@ dns__rpz_timer_cb(isc_task_t *task, isc_event_t *event) {
REQUIRE(isc_nm_tid() >= 0);
REQUIRE(DNS_RPZ_ZONE_VALID(rpz));
dns_rpz_ref_rpzs(rpz->rpzs);
LOCK(&rpz->rpzs->maint_lock);
if (rpz->rpzs->shuttingdown) {
@ -1981,6 +1979,7 @@ dns__rpz_timer_cb(isc_task_t *task, isc_event_t *event) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
ISC_LOG_INFO, "rpz: %s: reload start", domain);
dns_rpz_ref_rpzs(rpz->rpzs);
isc_nm_work_offload(isc_task_getnetmgr(rpz->rpzs->updater),
update_rpz_cb, update_rpz_done_cb, rpz);