777. [bug] An empty forwarders list in a zone would not

                        override global forwarders. [RT #995]

diff --git a/CHANGES b/CHANGES
index a16d66ff9aa9052a1a3d1d7e2a6965e128a407ef..f67970e5cdc9a7b211d6a322e6130e703b1b929f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 777.  [bug]           An empty forwarders list in a zone failed to override
+                       global forwarders. [RT #995]
+
        --- 9.1.1 released ---
 
  775.   [bug]          Address match lists with invalid netmasks caused

diff --git a/bin/named/server.c b/bin/named/server.c
index 6c1663c775eef6df03a89cd12b5a822a8869f387..e4611d6b1e4b1f828581181df5ec1c4f06b6a860 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.276.2.1 2001/01/09 22:32:13 bwelling Exp $ */
+/* $Id: server.c,v 1.276.2.2 2001/03/13 02:40:22 bwelling Exp $ */
 
 #include <config.h>
 
@@ -118,9 +118,8 @@ ns_listenlist_fromconfig(dns_c_lstnlist_t *clist, dns_c_ctx_t *cctx,
                         isc_mem_t *mctx, ns_listenlist_t **target);
 
 static isc_result_t
-configure_forward(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
-                 dns_view_t *view, dns_name_t *origin,
-                 dns_c_iplist_t *forwarders);
+configure_forward(dns_c_ctx_t *cctx, dns_view_t *view, dns_name_t *origin,
+                 dns_c_iplist_t *forwarders, dns_c_forw_t forward);
 
 /*
  * Configure a single view ACL at '*aclp'.  Get its configuration by
@@ -534,8 +533,13 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview,
             dns_c_view_getforwarders(cview, &forwarders) == ISC_R_SUCCESS) ||
            (dns_c_ctx_getforwarders(cctx, &forwarders) == ISC_R_SUCCESS))
        {
-               result = configure_forward(cctx, NULL, cview, view,
-                                          dns_rootname, forwarders);
+               dns_c_forw_t fwd;
+               if (!((cview != NULL &&
+                      dns_c_view_getforward(cview, &fwd) == ISC_R_SUCCESS) ||
+                     (dns_c_ctx_getforward(cctx, &fwd) == ISC_R_SUCCESS)))
+                       fwd = dns_c_forw_first;
+               result = configure_forward(cctx, view,
+                                          dns_rootname, forwarders, fwd);
                dns_c_iplist_detach(&forwarders);
        }
 
@@ -956,11 +960,9 @@ configure_hints(dns_view_t *view, const char *filename) {
 }
 
 static isc_result_t
-configure_forward(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
-                 dns_view_t *view, dns_name_t *origin,
-                 dns_c_iplist_t *forwarders)
+configure_forward(dns_c_ctx_t *cctx, dns_view_t *view, dns_name_t *origin,
+                 dns_c_iplist_t *forwarders, dns_c_forw_t forward)
 {
-       dns_c_forw_t forward;
        dns_fwdpolicy_t fwdpolicy;
        isc_sockaddrlist_t addresses;
        isc_sockaddr_t *sa;
@@ -997,19 +999,13 @@ configure_forward(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
 
        if (ISC_LIST_EMPTY(addresses))
                fwdpolicy = dns_fwdpolicy_none;
-       else
-               fwdpolicy = dns_fwdpolicy_first;
-
-       if ((czone != NULL &&
-            dns_c_zone_getforward(czone, &forward) == ISC_R_SUCCESS) ||
-           (cview != NULL &&
-            dns_c_view_getforward(cview, &forward) == ISC_R_SUCCESS) ||
-           dns_c_ctx_getforward(cctx, &forward) == ISC_R_SUCCESS)
-       {
+       else {
                INSIST(forward == dns_c_forw_first ||
                       forward == dns_c_forw_only);
                if (forward == dns_c_forw_only)
                        fwdpolicy = dns_fwdpolicy_only;
+               else
+                       fwdpolicy = dns_fwdpolicy_first;
        }
 
        result = dns_fwdtable_add(view->fwdtable, origin, &addresses,
@@ -1089,7 +1085,7 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
        dns_zone_t *zone = NULL;        /* New or reused zone */
        dns_zone_t *dupzone = NULL;
        dns_c_iplist_t *forwarders = NULL;
-       dns_c_forw_t tfwd;
+       dns_c_forw_t forward;
 
        isc_result_t result;
 
@@ -1156,8 +1152,11 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
         * the appropriate selective forwarding configuration and return.
         */
        if (czone->ztype == dns_c_zone_forward) {
-               result = configure_forward(cctx, czone, cview, view, origin,
-                                          czone->u.fzone.forwarders);
+               if (dns_c_zone_getforward(czone, &forward) != ISC_R_SUCCESS)
+                       forward = dns_c_forw_first;
+               result = configure_forward(cctx, view, origin,
+                                          czone->u.fzone.forwarders,
+                                          forward);
                goto cleanup;
        }
 
@@ -1216,13 +1215,15 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview,
        }
 
        /*
-        * If the zone contains 'forward' or 'forwarders' statements,
+        * If the zone contains 'forwarders' statements,
         * configure selective forwarding.
         */
-       if (dns_c_zone_getforwarders(czone, &forwarders) == ISC_R_SUCCESS ||
-           dns_c_zone_getforward(czone, &tfwd) == ISC_R_SUCCESS)
-               CHECK(configure_forward(cctx, czone, cview, view,
-                                       origin, forwarders));
+       if (dns_c_zone_getforwarders(czone, &forwarders) == ISC_R_SUCCESS) {
+               if (dns_c_zone_getforward(czone, &forward) != ISC_R_SUCCESS)
+                       forward = dns_c_forw_first;
+               CHECK(configure_forward(cctx, view,
+                                       origin, forwarders, forward));
+       }
 
        /*
         * Configure the zone.

diff --git a/lib/dns/config/confzone.c b/lib/dns/config/confzone.c
index 54502c8e06fc88f5c8f61316f4f2ac3482fcd717..4ad8d8ed846a1779e71d5e459addddb138170a1a 100644 (file)
--- a/lib/dns/config/confzone.c
+++ b/lib/dns/config/confzone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confzone.c,v 1.72.2.4 2001/03/05 19:35:52 bwelling Exp $ */
+/* $Id: confzone.c,v 1.72.2.5 2001/03/13 02:40:20 bwelling Exp $ */
 
 #include <config.h>
 
@@ -4432,8 +4432,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 
        switch (zone->ztype) {
        case dns_c_zone_master:
-               if (zone->u.mzone.forwarders != NULL &&
-                   zone->u.mzone.forwarders->nextidx > 0) {
+               if (zone->u.mzone.forwarders != NULL) {
                        *retval = zone->u.mzone.forwarders;
                        res = ISC_R_SUCCESS;
                } else {
@@ -4442,8 +4441,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
                break;
 
        case dns_c_zone_slave:
-               if (zone->u.szone.forwarders != NULL &&
-                   zone->u.szone.forwarders->nextidx > 0) {
+               if (zone->u.szone.forwarders != NULL) {
                        *retval = zone->u.szone.forwarders;
                        res = ISC_R_SUCCESS;
                } else {
@@ -4452,8 +4450,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
                break;
 
        case dns_c_zone_stub:
-               if (zone->u.tzone.forwarders != NULL &&
-                   zone->u.tzone.forwarders->nextidx > 0) {
+               if (zone->u.tzone.forwarders != NULL) {
                        *retval = zone->u.tzone.forwarders;
                        res = ISC_R_SUCCESS;
                } else {
@@ -4468,8 +4465,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
                return (ISC_R_FAILURE);
 
        case dns_c_zone_forward:
-               if (zone->u.fzone.forwarders != NULL &&
-                   zone->u.fzone.forwarders->nextidx > 0) {
+               if (zone->u.fzone.forwarders != NULL) {
                        *retval = zone->u.fzone.forwarders;
                        res = ISC_R_SUCCESS;
                } else {