Always return address records in additional section for NS queries

diff --git a/bin/named/query.c b/bin/named/query.c
index 58b5914d4fcb257fc9e8a4d7638052767ce1b023..f860d2e20c63fd820178bc105090621a3d08fc75 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -9637,6 +9637,12 @@ ns_query_start(ns_client_t *client) {
        {
                client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY |
                                             NS_QUERYATTR_NOADDITIONAL);
+       } else if (qtype == dns_rdatatype_ns) {
+               /*
+                * Always turn on additional records for NS queries.
+                */
+               client->query.attributes &= ~(NS_QUERYATTR_NOAUTHORITY |
+                                             NS_QUERYATTR_NOADDITIONAL);
        }
 
        /*