upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-25 05:18:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

some hunks misapplied, fctx->addrinfo is needed

Browse source
This commit is contained in:
Mark Andrews 2011-10-12 01:40:32 +00:00
parent ab51c5e4c7
commit df4074735e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/dns/resolver.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.384.14.33 2011/10/12 00:30:16 marka Exp $ */
/* $Id: resolver.c,v 1.384.14.34 2011/10/12 01:40:32 marka Exp $ */
/*! \file */
@ -273,6 +273,7 @@ struct fetchctx {
unsigned int findfail;
unsigned int valfail;
isc_boolean_t timeout;
dns_adbaddrinfo_t *addrinfo;
};
#define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!')
@ -3568,6 +3569,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
fctx->rand_buf = 0;
fctx->rand_bits = 0;
fctx->timeout = ISC_FALSE;
fctx->addrinfo = NULL;
dns_name_init(&fctx->nsname, NULL);
fctx->nsfetch = NULL;
@ -5242,6 +5244,9 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
if (aa)
rdataset->trust =
dns_trust_authauthority;
else if (ISFORWARDER(fctx->addrinfo))
rdataset->trust =
dns_trust_answer;
else
rdataset->trust =
dns_trust_additional;
@ -5295,6 +5300,9 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
if (aa)
rdataset->trust =
dns_trust_authauthority;
else if (ISFORWARDER(fctx->addrinfo))
rdataset->trust =
dns_trust_answer;
else
rdataset->trust =
dns_trust_additional;
@ -5329,12 +5337,6 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
else if (ISFORWARDER(fctx->addrinfo))
rdataset->trust =
dns_trust_answer;
else if (ISFORWARDER(fctx->addrinfo))
rdataset->trust =
dns_trust_answer;
else if (ISFORWARDER(fctx->addrinfo))
rdataset->trust =
dns_trust_answer;
else
rdataset->trust =
dns_trust_additional;
@ -6195,6 +6197,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
fctx->timeouts = 0;
fctx->timeout = ISC_FALSE;
fctx->addrinfo = query->addrinfo;
/*
* XXXRTH We should really get the current time just once. We