2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00

In query_find(), if we're looking up a key and dns_db_find() returns

DNS_R_DELEGATION, don't use the domain & ns set found by dns_db_find().
This means that a recursive server will not immediately ask the child zone
for a key set at the apex; the resolver will determine who to ask.
This commit is contained in:
Brian Wellington
2000-07-06 02:27:26 +00:00
parent 313b7db2ce
commit baeb4bcf32

View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: query.c,v 1.112 2000/07/05 23:10:06 gson Exp $ */ /* $Id: query.c,v 1.113 2000/07/06 02:27:26 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -1839,7 +1839,7 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
/* /*
* Invoke the resolver. * Invoke the resolver.
*/ */
REQUIRE(nameservers->type == dns_rdatatype_ns); REQUIRE(nameservers == NULL || nameservers->type == dns_rdatatype_ns);
REQUIRE(client->query.fetch == NULL); REQUIRE(client->query.fetch == NULL);
rdataset = query_newrdataset(client); rdataset = query_newrdataset(client);
@@ -2334,8 +2334,12 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
/* /*
* Recurse! * Recurse!
*/ */
result = query_recurse(client, qtype, fname, if (type == dns_rdatatype_key)
rdataset); result = query_recurse(client, qtype,
NULL, NULL);
else
result = query_recurse(client, qtype,
fname, rdataset);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS)
client->query.attributes |= client->query.attributes |=
NS_QUERYATTR_RECURSING; NS_QUERYATTR_RECURSING;