- Fix #630: Unify the RPZ log messages.

diff --git a/doc/Changelog b/doc/Changelog
index fa0afc95c20f5469b24bce2d25d2eb1b325f369a..58f02a5b9769a67a513e6f2520da07234a36dd57 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+28 February 2022: George
+       - Fix #630: Unify the RPZ log messages.
+
 28 February 2022: Wouter
        - Fix #633: Document unix domain socket support for unbound-control.
        - Fix for #633: updated fix with new text.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index cf4f1beac34a339f8b7778e7735b1730db013a69..29d2e79ed8f1a7ac568fa42c068598d3d80c602a 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2512,7 +2512,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                        iq->response = forged_response;
                        next_state(iq, FINISHED_STATE);
                        if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
-                               log_err("rpz, prepend rrsets: out of memory");
+                               log_err("rpz: prepend rrsets: out of memory");
                                return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
                        }
                        return 0;
@@ -3069,7 +3069,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                                iq->response = forged_response;
                                next_state(iq, FINISHED_STATE);
                                if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
-                                       log_err("rpz after cname, prepend rrsets: out of memory");
+                                       log_err("rpz: after cname, prepend rrsets: out of memory");
                                        return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
                                }
                                qstate->return_msg->qinfo = qstate->qinfo;

diff --git a/respip/respip.c b/respip/respip.c
index 569943e9ea08cf4c7496a52013ad0250e1256cbe..deff663170aab1f716df19dfbd69fcddef3cd854 100644 (file)
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -970,7 +970,7 @@ respip_rewrite_reply(const struct query_info* qinfo,
                                                addr_to_str(&raddr->node.addr,
                                                        raddr->node.addrlen,
                                                        nm, sizeof(nm));
-                                               verbose(VERB_ALGO, "respip: rpz response-ip trigger %s/%d on %s %s with action %s", nm, raddr->node.net, qn, ip, rpz_action_to_string(respip_action_to_rpz_action(action)));
+                                               verbose(VERB_ALGO, "respip: rpz: response-ip trigger %s/%d on %s %s with action %s", nm, raddr->node.net, qn, ip, rpz_action_to_string(respip_action_to_rpz_action(action)));
                                        }
                                        /* break to make sure 'a' stays pointed
                                         * to used auth_zone, and keeps lock */
@@ -1308,7 +1308,7 @@ respip_inform_print(struct respip_action_info* respip_actinfo, uint8_t* qname,
                respip, sizeof(respip));
        if(respip_actinfo->rpz_log) {
                txtlen += snprintf(txt+txtlen, sizeof(txt)-txtlen, "%s",
-                       "RPZ applied ");
+                       "rpz: applied ");
                if(respip_actinfo->rpz_cname_override)
                        actionstr = rpz_action_to_string(
                                RPZ_CNAME_OVERRIDE_ACTION);

diff --git a/services/rpz.c b/services/rpz.c
index 309fda22f9489bbf00f921d8213b406bb99c816b..54f77803af2cde6c56c756571dae88b68c23742a 100644 (file)
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -526,13 +526,13 @@ rpz_create(struct config_auth* p)
                size_t nmlen = sizeof(nm);
 
                if(!p->rpz_cname) {
-                       log_err("RPZ override with cname action found, but no "
+                       log_err("rpz: override with cname action found, but no "
                                "rpz-cname-override configured");
                        goto err;
                }
 
                if(sldns_str2wire_dname_buf(p->rpz_cname, nm, &nmlen) != 0) {
-                       log_err("cannot parse RPZ cname override: %s",
+                       log_err("rpz: cannot parse cname override: %s",
                                p->rpz_cname);
                        goto err;
                }
@@ -614,7 +614,7 @@ rpz_insert_local_zones_trigger(struct local_zones* lz, uint8_t* dname,
                        return; /* no need to log these types as unsupported */
                }
                dname_str(dname, str);
-               verbose(VERB_ALGO, "RPZ: qname trigger, %s skipping unsupported action: %s",
+               verbose(VERB_ALGO, "rpz: qname trigger, %s skipping unsupported action: %s",
                        str, rpz_action_to_string(a));
                free(dname);
                return;
@@ -999,7 +999,7 @@ rpz_insert_response_ip_trigger(struct rpz* r, uint8_t* dname, size_t dnamelen,
                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",
+               verbose(VERB_ALGO, "rpz: respip trigger, %s skipping unsupported action: %s",
                        str, rpz_action_to_string(a));
                return 0;
        }