ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

When returning from validation, make sure to handle chaiing correctly.

Browse Source
This commit is contained in:
Brian Wellington
2001-02-21 05:16:44 +00:00
parent fbafe841ef
commit 36608f2052
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.203 2001/02/19 08:54:52 halley Exp $ */
/* $Id: resolver.c,v 1.204 2001/02/21 05:16:44 bwelling Exp $ */
#include <config.h>
@@ -2415,6 +2415,7 @@ validated(isc_task_t *task, isc_event_t *event) {
dns_rdataset_t *asigrdataset = NULL;
dns_dbnode_t *node = NULL;
isc_boolean_t negative;
isc_boolean_t chaining;
isc_boolean_t sentresponse;
isc_uint32_t ttl;
@@ -2451,6 +2452,25 @@ validated(isc_task_t *task, isc_event_t *event) {
goto cleanup_event;
}
/*
* If chaining, we need to make sure that the right result code is
* returned, and that the rdatasets are bound.
*/
if (vevent->result == ISC_R_SUCCESS &&
!negative &&
vevent->rdataset != NULL &&
CHAINING(vevent->rdataset))
{
if (vevent->rdataset->type == dns_rdatatype_cname)
eresult = DNS_R_CNAME;
else {
INSIST(vevent->rdataset->type == dns_rdatatype_dname);
eresult = DNS_R_DNAME;
}
chaining = ISC_TRUE;
} else
chaining = ISC_FALSE;
/*
* Either we're not shutting down, or we are shutting down but want
* to cache the result anyway (if this was a validation started by
@@ -2459,7 +2479,7 @@ validated(isc_task_t *task, isc_event_t *event) {
hevent = ISC_LIST_HEAD(fctx->events);
if (hevent != NULL) {
if (!negative &&
if (!negative && !chaining &&
(fctx->type == dns_rdatatype_any ||
fctx->type == dns_rdatatype_sig)) {
/*