2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00

Always return address records in additional section for NS queries

This commit is contained in:
Diego Fronza
2020-09-30 17:22:39 -03:00
parent 1cee557993
commit d727eaae6c

View File

@@ -1683,7 +1683,9 @@ query_additional_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
* If we want only minimal responses and are here, then it must * If we want only minimal responses and are here, then it must
* be for glue. * be for glue.
*/ */
if (qctx->view->minimalresponses == dns_minimal_yes) { if (qctx->view->minimalresponses == dns_minimal_yes &&
client->query.qtype != dns_rdatatype_ns)
{
goto try_glue; goto try_glue;
} }
@@ -11287,6 +11289,12 @@ ns_query_start(ns_client_t *client, isc_nmhandle_t *handle) {
{ {
client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY |
NS_QUERYATTR_NOADDITIONAL); 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);
} }
/* /*