From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 3 Feb 2020 15:52:25 +0000 (+0100)
Subject: - Reformat rpz disabled stats counter
X-Git-Tag: release-1.10.0rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fc622031d2a2c9195815da3a38495633c383b7c;p=thirdparty%2Funbound.git

- Reformat rpz disabled stats counter
---

diff --git a/daemon/worker.c b/daemon/worker.c
index d41453f7c..c41cc5f85 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -603,8 +603,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo,
 
 		if(worker->stats.extended && actinfo.rpz_used) {
 			if(actinfo.rpz_disabled)
-				worker->stats.rpz_action[RPZ_DISABLED_ACTION] +=
-					actinfo.rpz_disabled;
+				worker->stats.rpz_action[RPZ_DISABLED_ACTION]++;
 			if(actinfo.rpz_cname_override)
 				worker->stats.rpz_action[RPZ_CNAME_OVERRIDE_ACTION]++;
 			else
diff --git a/services/mesh.c b/services/mesh.c
index 039eab53a..61127c845 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1191,8 +1191,7 @@ void mesh_query_done(struct mesh_state* mstate)
 			if(mstate->s.env->cfg->stat_extended &&
 				mstate->s.respip_action_info->rpz_used) {
 				if(mstate->s.respip_action_info->rpz_disabled)
-					mstate->s.env->mesh->rpz_action[RPZ_DISABLED_ACTION] +=
-						mstate->s.respip_action_info->rpz_disabled;
+					mstate->s.env->mesh->rpz_action[RPZ_DISABLED_ACTION]++;
 				if(mstate->s.respip_action_info->rpz_cname_override)
 					mstate->s.env->mesh->rpz_action[RPZ_CNAME_OVERRIDE_ACTION]++;
 				else