806. [bug] DNS_R_SEENINCLUDE was failing to propogate back up

                        the calling stack to the zone maintence level.

diff --git a/CHANGES b/CHANGES
index 657b5bd238b8605023e9d29ba6da879adcb778c3..5b546a85c4fd82a8131033bc6a49d6020d7241cc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 806.  [bug]           DNS_R_SEENINCLUDE was failing to propogate back up
+                       the calling stack to the zone maintence level.
 
  805.  [bug]           When using "forward only", missing root hints should
                        not cause queries to fail. [RT #1143]

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 265fcb26c7a0e3eb05622d4894d09b01ff795966..e93db068009de395049dd3892f4a16c6cbb20bf0 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.67 2001/01/09 21:50:43 bwelling Exp $ */
+/* $Id: db.c,v 1.68 2001/04/10 03:05:55 marka Exp $ */
 
 /***
  *** Imports
@@ -328,7 +328,8 @@ dns_db_load(dns_db_t *db, const char *filename) {
         * result if dns_master_loadfile() succeeded.  If dns_master_loadfile()
         * failed, we want to return the result code it gave us.
         */
-       if (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)
+       if (eresult != ISC_R_SUCCESS &&
+           (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
                result = eresult;
 
        return (result);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2c704f65bcd102df5b95c63c0c109c33fbc6d58e..e749584929d94061b49f681e62c9ff3c21a62aa2 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.316 2001/03/28 23:36:53 bwelling Exp $ */
+/* $Id: zone.c,v 1.317 2001/04/10 03:05:54 marka Exp $ */
 
 #include <config.h>
 
@@ -4732,7 +4732,8 @@ zone_loaddone(void *arg, isc_result_t result) {
        ENTER;
 
        tresult = dns_db_endload(load->db, &load->callbacks.add_private);
-       if (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)
+       if (tresult != ISC_R_SUCCESS && 
+           (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
                result = tresult;
 
        LOCK_ZONE(load->zone);