From 86529bb6979dbe3ffd7bc2df078fac21cb339953 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 10 Apr 2001 03:05:55 +0000
Subject: [PATCH]  806.   [bug]           DNS_R_SEENINCLUDE was failing to
 propogate back up                         the calling stack to the zone
 maintence level.

---
 CHANGES        | 2 ++
 lib/dns/db.c   | 5 +++--
 lib/dns/zone.c | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 657b5bd238..5b546a85c4 100644
--- 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 265fcb26c7..e93db06800 100644
--- 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 2c704f65bc..e749584929 100644
--- 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);