Commit 164e2a6f authored by Mark Andrews's avatar Mark Andrews
Browse files

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

                        [RT #13428]
parent 498e6286
1800. [bug] Changes #1719 allowed a INSIST to be triggered.
[RT #13428]
1799. [placeholder] rt13438 1799. [placeholder] rt13438
1798. [func] The server syntax has been extended to support a 1798. [func] The server syntax has been extended to support a
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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> #include <config.h>
...@@ -4253,11 +4253,11 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname, ...@@ -4253,11 +4253,11 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
/* /*
* A negative response has a SOA record (Type 2) * A negative response has a SOA record (Type 2)
* and a optional NS RRset (Type 1) or it has neither * and a optional NS RRset (Type 1) or it has neither
* a SOA or a NS RRset (Type 3) or rcode is NXDOMAIN * a SOA or a NS RRset (Type 3, handled above) or
* (handled above) in which case the NS RRset is * rcode is NXDOMAIN (handled above) in which case
* allowed (Type 4). * the NS RRset is allowed (Type 4).
*/ */
if (soa_name != NULL || ns_name == NULL) if (soa_name != NULL)
negative_response = ISC_TRUE; negative_response = ISC_TRUE;
for (rdataset = ISC_LIST_HEAD(name->list); for (rdataset = ISC_LIST_HEAD(name->list);
rdataset != NULL; rdataset != NULL;
...@@ -5320,6 +5320,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) { ...@@ -5320,6 +5320,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
if ((fctx->res->options & DNS_RESOLVER_CHECKNAMES) != 0) if ((fctx->res->options & DNS_RESOLVER_CHECKNAMES) != 0)
checknames(message); checknames(message);
/*
* Clear cache bits.
*/
fctx->attributes &= ~(FCTX_ATTR_WANTNCACHE | FCTX_ATTR_WANTCACHE);
/* /*
* Did we get any answers? * Did we get any answers?
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment