1800. [bug] Changes #1719 allowed a INSIST to be triggered.

[RT #13428]
This commit is contained in:
Mark Andrews 2005-01-19 23:25:41 +00:00
parent 498e628692
commit 164e2a6f83
2 changed files with 13 additions and 5 deletions

View file

@ -1,3 +1,6 @@
1800. [bug] Changes #1719 allowed a INSIST to be triggered.
[RT #13428]
1799. [placeholder] rt13438
1798. [func] The server syntax has been extended to support a

View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.299 2004/12/03 01:59:28 marka Exp $ */
/* $Id: resolver.c,v 1.300 2005/01/19 23:25:41 marka Exp $ */
#include <config.h>
@ -4253,11 +4253,11 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
/*
* A negative response has a SOA record (Type 2)
* and a optional NS RRset (Type 1) or it has neither
* a SOA or a NS RRset (Type 3) or rcode is NXDOMAIN
* (handled above) in which case the NS RRset is
* allowed (Type 4).
* a SOA or a NS RRset (Type 3, handled above) or
* rcode is NXDOMAIN (handled above) in which case
* the NS RRset is allowed (Type 4).
*/
if (soa_name != NULL || ns_name == NULL)
if (soa_name != NULL)
negative_response = ISC_TRUE;
for (rdataset = ISC_LIST_HEAD(name->list);
rdataset != NULL;
@ -5320,6 +5320,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
if ((fctx->res->options & DNS_RESOLVER_CHECKNAMES) != 0)
checknames(message);
/*
* Clear cache bits.
*/
fctx->attributes &= ~(FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE);
/*
* Did we get any answers?
*/