From: George Thessalonikefs Date: Tue, 4 Aug 2020 10:49:43 +0000 (+0200) Subject: - Improve error log message when inserting rpz RR. X-Git-Tag: release-1.12.0rc1~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764a0dc765c96310c611bde80c14893b0814163d;p=thirdparty%2Funbound.git - Improve error log message when inserting rpz RR. --- diff --git a/doc/Changelog b/doc/Changelog index 9638d242f..f673908c3 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +4 August 2020: George + - Improve error log message when inserting rpz RR. + 4 August 2020: Wouter - Fix mini_event.h on OpenBSD cannot find fd_set. diff --git a/services/rpz.c b/services/rpz.c index 105f238d0..ba5dd186d 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -597,8 +597,18 @@ rpz_insert_rr(struct rpz* r, uint8_t* azname, size_t aznamelen, uint8_t* dname, uint8_t* policydname; if(!dname_subdomain_c(dname, azname)) { - log_err("RPZ: name of record to insert into RPZ is not a " - "subdomain of the configured name of the RPZ zone"); + char* dname_str = sldns_wire2str_dname(dname, dnamelen); + char* azname_str = sldns_wire2str_dname(azname, aznamelen); + if(dname_str && azname_str) { + log_err("RPZ: name of record (%s) to insert into RPZ is not a " + "subdomain of the configured name of the RPZ zone (%s)", + dname_str, azname_str); + } else { + log_err("RPZ: name of record to insert into RPZ is not a " + "subdomain of the configured name of the RPZ zone"); + } + free(dname_str); + free(azname_str); return 0; }