- Improve error log message when inserting rpz RR.

diff --git a/doc/Changelog b/doc/Changelog
index 9638d242f90be42a302879723723372407025196..f673908c30cf32073c4c74b1f0187dbb311d5dd6 100644 (file)
--- 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 105f238d0a6d0b4b5d0a1601fac598f6603c580e..ba5dd186daadc53a26f61c24a653d009a312f069 100644 (file)
--- 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;
        }