From: George Thessalonikefs Date: Mon, 28 Feb 2022 11:07:25 +0000 (+0100) Subject: - Fix #630: Unify the RPZ log messages. X-Git-Tag: release-1.16.0rc1~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82adcfb971df9634fea191208235d2aca05eff89;p=thirdparty%2Funbound.git - Fix #630: Unify the RPZ log messages. --- diff --git a/doc/Changelog b/doc/Changelog index fa0afc95c..58f02a5b9 100644 --- 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 cf4f1beac..29d2e79ed 100644 --- 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 569943e9e..deff66317 100644 --- 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 309fda22f..54f77803a 100644 --- 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; }