pullup:

 806.   [bug]           DNS_R_SEENINCLUDE was failing to propagate back up
                        the calling stack to the zone maintence level.

diff --git a/CHANGES b/CHANGES
index 7937d4ac6f292a9a2b17f19f348094ddae782a8d..42d146f3dd066d5878e41d96e5961b0d8d714440 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
  822.  [bug]           Sending nxrrset prerequisites would crash nsupdate.
                        [RT #1248]
 
+ 806.  [bug]           DNS_R_SEENINCLUDE was failing to propagate back up
+                       the calling stack to the zone maintence level.
+
  669.  [bug]           dnssec-keygen now makes the public key file
                        non-world-readable for symmetric keys. [RT #403]
 

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 1ef81ea1755714a3c229fc816315749ca5b8630b..8da2c6db9a3c167b7d802606fa9e043f25ea21b4 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.65.4.1 2001/01/09 22:43:28 bwelling Exp $ */
+/* $Id: db.c,v 1.65.4.2 2001/05/14 23:50:47 gson 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 952016e1c0afda9e6d6cd32f7d8af3597125508c..d223a79f0623f956fee9f7c361434f5107f5fcf1 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.283.2.11 2001/05/14 03:22:06 marka Exp $ */
+/* $Id: zone.c,v 1.283.2.12 2001/05/14 23:50:49 gson Exp $ */
 
 #include <config.h>
 
@@ -4728,7 +4728,8 @@ zone_loaddone(void *arg, isc_result_t result) {
        DNS_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);