From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 21 May 2021 12:56:38 +0000 (+0200)
Subject: - rpz-triggers, silence qname trigger explanation in rpz-log, this is
X-Git-Tag: release-1.14.0rc1~62^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76532f7447a610949f0d2e0d4e74f81cda5ea4af;p=thirdparty%2Funbound.git

- rpz-triggers, silence qname trigger explanation in rpz-log, this is
  backwards compatible.
---

diff --git a/services/rpz.c b/services/rpz.c
index 3a4404360..085353b3f 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -1399,9 +1399,11 @@ log_rpz_apply(char* trigger, uint8_t* dname, struct addr_tree_node* addrnode,
 		port = 0;
 	}
 	snprintf(portstr, sizeof(portstr), "@%u", (unsigned)port);
-	snprintf(txt, sizeof(txt), "rpz: applied %s%s%s%s %s %s %s%s",
+	snprintf(txt, sizeof(txt), "rpz: applied %s%s%s%s%s%s %s %s%s",
 		(log_name?"[":""), (log_name?log_name:""), (log_name?"] ":""),
-		trigger, dnamestr, rpz_action_to_string(a),
+		(strcmp(trigger,"qname")==0?"":trigger),
+		(strcmp(trigger,"qname")==0?"":" "),
+		dnamestr, rpz_action_to_string(a),
 		(ip[0]?ip:""), (ip[0]?portstr:""));
 	log_nametypeclass(0, txt, qinfo->qname, qinfo->qtype, qinfo->qclass);
 }