- Fix compile warnings in rpz initialization.

diff --git a/daemon/worker.c b/daemon/worker.c
index 427ab4a92b0962ad2efcd42643f81f6347629311..76c4bb5b1e76702912dd17bb887d17d369497378 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -576,7 +576,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo,
        struct comm_reply* repinfo, struct ub_packed_rrset_key** alias_rrset,
        struct reply_info** encode_repp, struct auth_zones* az)
 {
-       struct respip_action_info actinfo = {0};
+       struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
        actinfo.action = respip_none;
 
        if(qinfo->qtype != LDNS_RR_TYPE_A &&

diff --git a/doc/Changelog b/doc/Changelog
index c4fbe4544061d8ba5635f404aed08820b230d4bf..355222bf440fa616a09a13dbb156252321d9ffef 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix compile warning for type cast in http2_submit_dns_response.
        - Fix when use free buffer to initialize rbtree for stream reuse.
        - Fix compile warnings for windows.
+       - Fix compile warnings in rpz initialization.
 
 26 November 2020: Wouter
        - Fix to omit UDP receive errors from log, if verbosity low.

diff --git a/respip/respip.c b/respip/respip.c
index 6fa4f18851fdefbf6cc5325f60cabd5f837c4189..9ee098def8204d65e01156703a2364d5599e7380 100644 (file)
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -914,7 +914,7 @@ respip_rewrite_reply(const struct query_info* qinfo,
        int ret = 1;
        struct ub_packed_rrset_key* redirect_rrset = NULL;
        struct rpz* r;
-       struct auth_zone* a;
+       struct auth_zone* a = NULL;
        struct ub_packed_rrset_key* data = NULL;
        int rpz_used = 0;
        int rpz_log = 0;
@@ -1109,7 +1109,7 @@ respip_operate(struct module_qstate* qstate, enum module_ev event, int id,
                        qstate->return_msg && qstate->return_msg->rep) {
                        struct reply_info* new_rep = qstate->return_msg->rep;
                        struct ub_packed_rrset_key* alias_rrset = NULL;
-                       struct respip_action_info actinfo = {0};
+                       struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
                        actinfo.action = respip_none;
 
                        if(!respip_rewrite_reply(&qstate->qinfo,
@@ -1170,7 +1170,7 @@ respip_merge_cname(struct reply_info* base_rep,
        struct ub_packed_rrset_key* alias_rrset = NULL; /* ditto */
        uint16_t tgt_rcode;
        size_t i, j;
-       struct respip_action_info actinfo = {0};
+       struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
        actinfo.action = respip_none;
 
        /* If the query for the CNAME target would result in an unusual rcode,