ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
the calling stack to the zone maintence level.
This commit is contained in:
Mark Andrews
2001-04-10 03:05:55 +00:00
parent abd51a9a96
commit 86529bb697
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -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]

5
lib/dns/db.c
View File

@@ -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);

5
lib/dns/zone.c
View File

@@ -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);