From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 12 Mar 2021 08:10:11 +0000 (+0100)
Subject: - rpz trigger, fix merge for unsupported ipaddr based trigger action.
X-Git-Tag: release-1.14.0rc1~62^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5d82dd48704b1a854c2802afcbebba980e1792;p=thirdparty%2Funbound.git

- rpz trigger, fix merge for unsupported ipaddr based trigger action.
---

diff --git a/services/rpz.c b/services/rpz.c
index cf2c10191..843036f34 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -704,15 +704,6 @@ rpz_insert_ipaddr_based_trigger(struct respip_set* set, struct sockaddr_storage*
 	enum respip_action respa = rpz_action_to_respip_action(a);
 
 	lock_rw_wrlock(&set->lock);
-	if(a == RPZ_TCP_ONLY_ACTION || a == RPZ_INVALID_ACTION ||
-		respa == respip_invalid) {
-		char str[255+1];
-		dname_str(dname, str);
-		verbose(VERB_ALGO, "RPZ: respip trigger, %s skipping unsupported action: %s",
-			str, rpz_action_to_string(a));
-		return 0;
-	}
-
 	rrstr = sldns_wire2str_rr(rr, rr_len);
 	if(rrstr == NULL) {
 		log_err("malloc error while inserting rpz ipaddr based trigger");
@@ -949,6 +940,15 @@ rpz_insert_response_ip_trigger(struct rpz* r, uint8_t* dname, size_t dnamelen,
 		return 0;
 	}
 
+	if(a == RPZ_TCP_ONLY_ACTION || a == RPZ_INVALID_ACTION ||
+		rpz_action_to_respip_action(a) == respip_invalid) {
+		char str[255+1];
+		dname_str(dname, str);
+		verbose(VERB_ALGO, "RPZ: respip trigger, %s skipping unsupported action: %s",
+			str, rpz_action_to_string(a));
+		return 0;
+	}
+
 	return rpz_insert_ipaddr_based_trigger(r->respip_set, &addr, addrlen, net,
 			a, rrtype, rrclass, ttl, rdata, rdata_len, rr, rr_len);
 }