2163. [bug] If only one of query-source and query-source-v6

                        specified a port the query pools code broke (change
                        2129).  [RT #16768]

diff --git a/CHANGES b/CHANGES
index e9fed1d22695c5f922cacad654ee946a72266a97..be35fabc8c68e26a0bf28b246229db7561c9f6d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2163.  [bug]           If only one of query-source and query-source-v6
+                       specified a port the query pools code broke (change
+                       2129).  [RT #16768]
+
 2162.  [func]          Allow "rrset-order fixed" to be disabled at compile
                        time. [RT #16665]
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 52a44b5108edca4827e9ad2c82ae33c86f1b021d..0410c7868bbfd96f72e900ccffc4d7b3acea0e8b 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.345 2007/03/06 00:38:57 marka Exp $ */
+/* $Id: resolver.c,v 1.346 2007/03/29 04:13:22 marka Exp $ */
 
 /*! \file */
 
@@ -1182,7 +1182,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                        }
                        switch (isc_sockaddr_pf(&addrinfo->sockaddr)) {
                        case PF_INET:
-                               if (res->ndisps > 0) {
+                               if (res->dispatchv4pool != NULL) {
                                        RES_LOCK(&res->poollock,
                                                 isc_rwlocktype_read);
                                        dns_dispatch_attach(res->dispatchv4pool[did],
@@ -1195,7 +1195,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                                }
                                break;
                        case PF_INET6:
-                               if (res->ndisps > 0) {
+                               if (res->dispatchv6pool != NULL) {
                                        RES_LOCK(&res->poollock,
                                                 isc_rwlocktype_read);
                                        dns_dispatch_attach(res->dispatchv6pool[did],