upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

In rctx_answer return DNS_R_DELEGATION on NOFOLLOW

Browse source 
When DNS_FETCHOPT_NOFOLLOW is set DNS_R_DELEGATION needs to be
returned to restart the resolution process rather than converting
it to ISC_R_SUCCESS.

(cherry picked from commit ea11650376)
This commit is contained in:
Mark Andrews 2023-05-19 12:22:51 +10:00 committed by Ondřej Surý
parent 7f2eeb60ee
commit 5739b4817a
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/dns/resolver.c
View file

@ -8005,7 +8005,8 @@ resquery_response(isc_result_t eresult, isc_region_t *region, void *arg) {
break;
case DNS_R_DELEGATION:
/*
* With NOFOLLOW we want to pass the result code.
* With NOFOLLOW we want to pass return
* DNS_R_DELEGATION to resume_qmin.
*/
if ((fctx->options & DNS_FETCHOPT_NOFOLLOW) == 0) {
result = ISC_R_SUCCESS;
@ -8549,6 +8550,14 @@ rctx_answer(respctx_t *rctx) {
}
if (result == DNS_R_DELEGATION) {
/*
* With NOFOLLOW we want to return DNS_R_DELEGATION to
* resume_qmin.
*/
if ((rctx->fctx->options & DNS_FETCHOPT_NOFOLLOW) != 0)
{
return (result);
}
result = ISC_R_SUCCESS;
} else {
/*
@ -8590,7 +8599,7 @@ rctx_answer_positive(respctx_t *rctx) {
isc_result_t result;
fetchctx_t *fctx = rctx->fctx;
FCTXTRACE("rctx_answer");
FCTXTRACE("rctx_answer_positive");
rctx_answer_init(rctx);
rctx_answer_scan(rctx);