upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix unable to resolve after new WLAN connection, due to auth-zone

Browse source 
failing with a forwarder set.  Now, auth-zone is only used for
  answers (not referrals) when a forwarder is set.


git-svn-id: file:///svn/unbound/trunk@4600 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-04-03 12:22:35 +00:00
parent 3d1f9ae9d3
commit 4e0128f16a
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,5 +1,8 @@
3 April 2018: Wouter 3 April 2018: Wouter
- Fix #4043: make test fails due to v6 presentation issue in macOS. - Fix #4043: make test fails due to v6 presentation issue in macOS.
- Fix unable to resolve after new WLAN connection, due to auth-zone
failing with a forwarder set. Now, auth-zone is only used for
answers (not referrals) when a forwarder is set.
29 March 2018: Ralph 29 March 2018: Ralph
- Check "result" in dup_all(), by Florian Obser. - Check "result" in dup_all(), by Florian Obser.

7
iterator/iterator.c
View file

@ -2161,12 +2161,16 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
log_dns_msg("msg from auth zone", log_dns_msg("msg from auth zone",
&iq->response->qinfo, iq->response->rep); &iq->response->qinfo, iq->response->rep);
} }
if((iq->chase_flags&BIT_RD) && !(iq->response->rep->flags&BIT_AA)) {
verbose(VERB_ALGO, "forwarder, ignoring referral from auth zone");
} else {
iq->num_current_queries++; iq->num_current_queries++;
iq->chase_to_rd = 0; iq->chase_to_rd = 0;
iq->dnssec_lame_query = 0; iq->dnssec_lame_query = 0;
iq->auth_zone_response = 1; iq->auth_zone_response = 1;
return next_state(iq, QUERY_RESP_STATE); return next_state(iq, QUERY_RESP_STATE);
} }
}
iq->auth_zone_response = 0; iq->auth_zone_response = 0;
if(auth_fallback == 0) { if(auth_fallback == 0) {
/* like we got servfail from the auth zone lookup, and /* like we got servfail from the auth zone lookup, and
@ -2443,7 +2447,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
(int)((iq->chase_flags&BIT_RD) || iq->chase_to_rd), (int)((iq->chase_flags&BIT_RD) || iq->chase_to_rd),
iq->response, &iq->qchase, iq->dp); iq->response, &iq->qchase, iq->dp);
iq->chase_to_rd = 0; iq->chase_to_rd = 0;
if(type == RESPONSE_TYPE_REFERRAL && (iq->chase_flags&BIT_RD)) { if(type == RESPONSE_TYPE_REFERRAL && (iq->chase_flags&BIT_RD) &&
!iq->auth_zone_response) {
/* When forwarding (RD bit is set), we handle referrals /* When forwarding (RD bit is set), we handle referrals
* differently. No queries should be sent elsewhere */ * differently. No queries should be sent elsewhere */
type = RESPONSE_TYPE_ANSWER; type = RESPONSE_TYPE_ANSWER;