[master] better rrl shutdown bug fix

diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index e5bd7b73fcceb9c4859ae05c954f904b0ddcf425..3398d70a86e946e8f7128830320a02a489563b43 100644 (file)
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -786,7 +786,7 @@ free_qname(dns_rrl_t *rrl, dns_rrl_entry_t *e) {
        qbuf = get_qname(rrl, e);
        if (qbuf != NULL) {
                qbuf->e = NULL;
-               ISC_LIST_INITANDAPPEND(rrl->qname_free, qbuf, link);
+               ISC_LIST_APPEND(rrl->qname_free, qbuf, link);
        }
 }
 
@@ -912,6 +912,7 @@ make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e,
                                qbuf = isc_mem_get(rrl->mctx, sizeof(*qbuf));
                                if (qbuf != NULL) {
                                        memset(qbuf, 0, sizeof(*qbuf));
+                                       ISC_LINK_INIT(qbuf, link);
                                        qbuf->index = rrl->num_qnames;
                                        rrl->qnames[rrl->num_qnames++] = qbuf;
                                } else {