From dbe761ac414e327b2e13c3f5d2ac8a9d5b5e09c1 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Tue, 26 Feb 2013 23:39:38 -0800
Subject: [PATCH] [master] better rrl shutdown bug fix

---
 lib/dns/rrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index e5bd7b73fc..3398d70a86 100644
--- 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 {