From: mb <mb@64k.by>
Date: Tue, 3 Nov 2020 14:45:26 +0000 (+0100)
Subject: RPZ: fix for c89
X-Git-Tag: release-1.14.0rc1~62^2~53^2^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4de71fe07e2272d17fb1ebe753bd61b6476c97;p=thirdparty%2Funbound.git

RPZ: fix for c89
---

diff --git a/services/mesh.c b/services/mesh.c
index a255595e8..ec2e940a4 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1209,10 +1209,6 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	struct timeval end_time;
 	struct timeval duration;
 	int secure;
-
-	rcode = mesh_is_udp(r) && mesh_is_rpz_respip_tcponly_action(m)
-			? (rcode|BIT_TC) : rcode;
-
 	/* Copy the client's EDNS for later restore, to make sure the edns
 	 * compare is with the correct edns options. */
 	struct edns_data edns_bak = r->edns;
@@ -1222,6 +1218,11 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	 * null stops the mesh state remove and thus
 	 * reply_list modification and accounting */
 	struct mesh_reply* rlist = m->reply_list;
+
+	/* RPZ: apply actions */
+	rcode = mesh_is_udp(r) && mesh_is_rpz_respip_tcponly_action(m)
+			? (rcode|BIT_TC) : rcode;
+
 	/* examine security status */
 	if(m->s.env->need_to_validate && (!(r->qflags&BIT_CD) ||
 		m->s.env->cfg->ignore_cd) && rep &&