1685. [bug] Change #1679 loop tests weren't quite right.

diff --git a/CHANGES b/CHANGES
index eb91090f7f02fe7869dece2ba9dd1da8464b4849..59ad8a24b376965ecc79671fb9b7fd5d32649f21 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
        --- 9.3.0rc2 released ---
 
+1685.  [bug]           Change #1679 loop tests weren't quite right.
+
 1683.  [bug]           dig +sigchase could leak memory. [RT #11445]
 
 1682.  [port]          Update configure test for (long long) printf format.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 6c5f607fd4507b75d9edebb1ba6476622aac39f9..0d8671fb520565c07de126ee092739ba7835f2d8 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.40 2004/06/27 01:29:51 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.41 2004/07/02 21:48:27 sra Exp $ */
 
 #include <config.h>
 
@@ -2119,7 +2119,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
                        if (addrinfo != NULL)
                                break;
                        find = ISC_LIST_NEXT(find, publink);
-                       if (find != fctx->find && find == NULL)
+                       if (find == NULL)
                                find = ISC_LIST_HEAD(fctx->finds);
                } while (find != start);
        }
@@ -2164,7 +2164,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
                        if (addrinfo != NULL)
                                break;
                        find = ISC_LIST_NEXT(find, publink);
-                       if (find != fctx->altfind && find == NULL)
+                       if (find == NULL)
                                find = ISC_LIST_HEAD(fctx->altfinds);
                } while (find != start);
        }