2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00

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

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

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.

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,7 +2102,8 @@ 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) {
do {
for (addrinfo = ISC_LIST_HEAD(find->list); for (addrinfo = ISC_LIST_HEAD(find->list);
addrinfo != NULL; addrinfo != NULL;
addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { addrinfo = ISC_LIST_NEXT(addrinfo, publink)) {
@@ -2119,6 +2120,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
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,7 +2146,8 @@ 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) {
do {
for (addrinfo = ISC_LIST_HEAD(find->list); for (addrinfo = ISC_LIST_HEAD(find->list);
addrinfo != NULL; addrinfo != NULL;
addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { addrinfo = ISC_LIST_NEXT(addrinfo, publink)) {
@@ -2161,6 +2164,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
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;