mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

468. [bug] dns_master_load*() failed to report file and line

Browse Source 
number in certain error conditions.

 467.   [bug]           dns_master_load*() failed to log an error if
                        pushfile() failed.

 466.   [bug]           dns_master_load*() could return success when it failed.
This commit is contained in:
Mark Andrews
2000-09-17 12:38:47 +00:00
parent 566155f16e
commit c50a002bd1
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@@ -1,3 +1,11 @@
468. [bug] dns_master_load*() failed to report file and line
number in certain error conditions.
467. [bug] dns_master_load*() failed to log an error if
pushfile() failed.
466. [bug] dns_master_load*() could return success when it failed.
465. [cleanup] Allow 0 to be set as an omapi_value_t value by 465. [cleanup] Allow 0 to be set as an omapi_value_t value by
omapi_value_storeint(). omapi_value_storeint().

21
lib/dns/master.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: master.c,v 1.65 2000/09/12 18:10:24 gson Exp $ */ /* $Id: master.c,v 1.66 2000/09/17 12:38:47 marka Exp $ */
#include <config.h> #include <config.h>
@@ -198,8 +198,10 @@ loadmgr_destroy(dns_loadmgr_t *mgr);
default: \ default: \
goto error_cleanup; \ goto error_cleanup; \
} \ } \
if ((token)->type == isc_tokentype_special) \ if ((token)->type == isc_tokentype_special) { \
result = DNS_R_SYNTAX; \
goto error_cleanup; \ goto error_cleanup; \
} \
} while (0) } while (0)
#define COMMITALL \ #define COMMITALL \
@@ -610,7 +612,7 @@ load(dns_loadctx_t **ctxp) {
ctx->origin, ctx->origin,
ctxp); ctxp);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto error_cleanup;
ctx = *ctxp; ctx = *ctxp;
continue; continue;
} }
@@ -702,7 +704,7 @@ load(dns_loadctx_t **ctxp) {
finish_include = ISC_FALSE; finish_include = ISC_FALSE;
result = pushfile(include_file, new_name, ctxp); result = pushfile(include_file, new_name, ctxp);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto error_cleanup;
ctx = *ctxp; ctx = *ctxp;
continue; continue;
} }
@@ -1079,8 +1081,15 @@ load(dns_loadctx_t **ctxp) {
goto cleanup; goto cleanup;
error_cleanup: error_cleanup:
(*callbacks->error)(callbacks, "dns_master_load: %s", if (result == ISC_R_NOMEMORY)
dns_result_totext(result)); (*callbacks->error)(callbacks, "dns_master_load: %s",
dns_result_totext(result));
else
(*callbacks->error)(callbacks, "%s: %s:%s: %s",
isc_lex_getsourcename(ctx->lex),
isc_lex_getsourceline(ctx->lex),
"dns_master_load",
dns_result_totext(result));
cleanup: cleanup:
while ((this = ISC_LIST_HEAD(current_list)) != NULL) while ((this = ISC_LIST_HEAD(current_list)) != NULL)