mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

1679. [bug] When there was a single nameserver with multiple

Browse Source 
addresses for a zone not all addresses were tried.
                        [RT #11706]
This commit is contained in:
Mark Andrews
2004-06-25 04:39:19 +00:00
parent 3b2032121d
commit e30e7913c9
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,6 +1,8 @@
1680. [placeholder] rt11697 1680. [placeholder] rt11697
1679. [placeholder] rt11706 1679. [bug] When there was a single nameserver with multiple
addresses for a zone not all addresses were tried.
[RT #11706]
1678. [bug] RRSIG should use TYPEXXXXX for unknown types. 1678. [bug] RRSIG should use TYPEXXXXX for unknown types.

70
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: resolver.c,v 1.289 2004/06/07 03:28:55 marka Exp $ */ /* $Id: resolver.c,v 1.290 2004/06/25 04:39:19 marka Exp $ */
#include <config.h> #include <config.h>
@@ -2102,23 +2102,25 @@ fctx_nextaddress(fetchctx_t *fctx) {
* Find the first unmarked addrinfo. * Find the first unmarked addrinfo.
*/ */
addrinfo = NULL; addrinfo = NULL;
while (find != fctx->find) { if (find != NULL) {
for (addrinfo = ISC_LIST_HEAD(find->list); do {
addrinfo != NULL; for (addrinfo = ISC_LIST_HEAD(find->list);
addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { addrinfo != NULL;
if (!UNMARKED(addrinfo)) addrinfo = ISC_LIST_NEXT(addrinfo, publink)) {
continue; if (!UNMARKED(addrinfo))
possibly_mark(fctx, addrinfo); continue;
if (UNMARKED(addrinfo)) { possibly_mark(fctx, addrinfo);
addrinfo->flags |= FCTX_ADDRINFO_MARK; if (UNMARKED(addrinfo)) {
break; addrinfo->flags |= FCTX_ADDRINFO_MARK;
break;
}
} }
} if (addrinfo != NULL)
if (addrinfo != NULL) break;
break; find = ISC_LIST_NEXT(find, publink);
find = ISC_LIST_NEXT(find, publink); if (find != fctx->find && find == NULL)
if (find != fctx->find && find == NULL) find = ISC_LIST_HEAD(fctx->finds);
find = ISC_LIST_HEAD(fctx->finds); } while (find != fctx->find);
} }
fctx->find = find; fctx->find = find;
@@ -2144,23 +2146,25 @@ fctx_nextaddress(fetchctx_t *fctx) {
* Find the first unmarked addrinfo. * Find the first unmarked addrinfo.
*/ */
addrinfo = NULL; addrinfo = NULL;
while (find != fctx->altfind) { if (find != NULL) {
for (addrinfo = ISC_LIST_HEAD(find->list); do {
addrinfo != NULL; for (addrinfo = ISC_LIST_HEAD(find->list);
addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { addrinfo != NULL;
if (!UNMARKED(addrinfo)) addrinfo = ISC_LIST_NEXT(addrinfo, publink)) {
continue; if (!UNMARKED(addrinfo))
possibly_mark(fctx, addrinfo); continue;
if (UNMARKED(addrinfo)) { possibly_mark(fctx, addrinfo);
addrinfo->flags |= FCTX_ADDRINFO_MARK; if (UNMARKED(addrinfo)) {
break; addrinfo->flags |= FCTX_ADDRINFO_MARK;
break;
}
} }
} if (addrinfo != NULL)
if (addrinfo != NULL) break;
break; find = ISC_LIST_NEXT(find, publink);
find = ISC_LIST_NEXT(find, publink); if (find != fctx->altfind && find == NULL)
if (find != fctx->altfind && find == NULL) find = ISC_LIST_HEAD(fctx->altfinds);
find = ISC_LIST_HEAD(fctx->altfinds); } while (find != fctx->altfind);
} }
faddrinfo = addrinfo; faddrinfo = addrinfo;