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

  backwards compatible.

diff --git a/services/rpz.c b/services/rpz.c
index 3a4404360a613ad5c505fe741c35cbcd1a023639..085353b3fdcfbe1530e219075099028ad8d184a2 100644 (file)
--- 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);
 }