- Fix to remove unused variables from RPZ clientip data structure.

diff --git a/doc/Changelog b/doc/Changelog
index 8d07f417d0e979b1181e9ccc164fbf3999a1248a..4e647d4df3553f4aaf22b598c52ce861090c5821 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 19 May 2023: Wouter
        - Fix RPZ removal of client-ip, nsip, nsdname triggers from IXFR.
+       - Fix to remove unused variables from RPZ clientip data structure.
 
 16 May 2023: Wouter
        - Fix #888: [FR] Use kernel timestamps for dnstap.

diff --git a/services/rpz.h b/services/rpz.h
index ae93af9a8223e3d548fe6d2b7f02a7488272e85e..e6d8bf566e16c7be77b8a9c611f027ee13f8d792 100644 (file)
--- a/services/rpz.h
+++ b/services/rpz.h
@@ -84,10 +84,11 @@ enum rpz_action {
        RPZ_CNAME_OVERRIDE_ACTION, /* RPZ CNAME action override*/
 };
 
-struct clientip_synthesized_rrset{
+struct clientip_synthesized_rrset {
        struct regional* region;
        struct rbtree_type entries;
-       lock_rw_type lock;      /* lock on the respip tree */
+       /** lock on the entries tree */
+       lock_rw_type lock;
 };
 
 struct clientip_synthesized_rr {
@@ -95,10 +96,6 @@ struct clientip_synthesized_rr {
        struct addr_tree_node node;
        /** lock on the node item */
        lock_rw_type lock;
-       /** tag bitlist */
-       uint8_t* taglist;
-       /** length of the taglist (in bytes) */
-       size_t taglen;
        /** action for this address span */
        enum rpz_action action;
        /** "local data" for this node */