From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 14 May 2021 14:41:54 +0000 (+0200)
Subject: - rpz-triggers, in callback from iterator, if rpz is disabled, skip.
X-Git-Tag: release-1.14.0rc1~62^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568aab1b67eb78e4307f517e29c891328d7d2c9b;p=thirdparty%2Funbound.git

- rpz-triggers, in callback from iterator, if rpz is disabled, skip.
---

diff --git a/services/rpz.c b/services/rpz.c
index d7bada4a9..a389cf101 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -2089,6 +2089,10 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 	for(a = az->rpz_first; a != NULL; a = a->rpz_az_next) {
 		lock_rw_rdlock(&a->lock);
 		r = a->rpz;
+		if(r->disabled) {
+			lock_rw_unlock(&a->lock);
+			continue;
+		}
 
 		/* the nsdname has precedence over the nsip triggers */
 		z = rpz_delegation_point_zone_lookup(is->dp, r->nsdname_zones,