From: Evan Hunt <each@isc.org>
Date: Tue, 18 Jun 2019 00:11:00 +0000 (-0700)
Subject: allow glue in authoritative responses to root priming queries
X-Git-Tag: v9.15.2~26^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7684c7b640c838308e43911477ace171db1597a;p=thirdparty%2Fbind9.git

allow glue in authoritative responses to root priming queries

- when processing authoritative queries for ./NS, set 'gluedb' so
  that glue will be included in the response, regardless of how
  'minimal-responses' has been configured.
---

diff --git a/lib/ns/query.c b/lib/ns/query.c
index d990f4a1504..9c8086cfc9f 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -7279,11 +7279,13 @@ query_respond(query_ctx_t *qctx) {
 		}
 
 		/*
-		 * BIND 8 priming queries need the additional section.
+		 * Always add glue for root priming queries, regardless
+		 * of "minimal-responses" setting.
 		 */
 		if (dns_name_equal(qctx->client->query.qname, dns_rootname)) {
 			qctx->client->query.attributes &=
 				~NS_QUERYATTR_NOADDITIONAL;
+			dns_db_attach(qctx->db, &qctx->client->query.gluedb);
 		}
 	}
 
@@ -10671,6 +10673,10 @@ ns_query_done(query_ctx_t *qctx) {
 	qctx_clean(qctx);
 	qctx_freedata(qctx);
 
+	if (qctx->client->query.gluedb != NULL) {
+		dns_db_detach(&qctx->client->query.gluedb);
+	}
+
 	/*
 	 * Clear the AA bit if we're not authoritative.
 	 */