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

1634. [bug] named didn't supply a useful error message when it

Browse Source 
detected duplicate views.  [RT #11208]
This commit is contained in:
Mark Andrews 2004-05-17 05:37:41 +00:00
parent be00eb0795
commit 4a6f552617
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -14,7 +14,8 @@
1635. [bug] Memory leak on error in query_addds(). 1635. [bug] Memory leak on error in query_addds().
1634. [placeholder] rt11208 1634. [bug] named didn't supply a useful error message when it
detected duplicate views. [RT #11208]
1633. [bug] named should return NOTIMP to update requests to a 1633. [bug] named should return NOTIMP to update requests to a
slaves without a allow-update-forwarding acl specified. slaves without a allow-update-forwarding acl specified.

30
lib/bind9/check.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: check.c,v 1.45 2004/04/15 23:40:24 marka Exp $ */ /* $Id: check.c,v 1.46 2004/05/17 05:37:41 marka Exp $ */
#include <config.h> #include <config.h>
@ -1175,6 +1175,7 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
cfg_listelt_t *velement; cfg_listelt_t *velement;
isc_result_t result = ISC_R_SUCCESS; isc_result_t result = ISC_R_SUCCESS;
isc_result_t tresult; isc_result_t tresult;
isc_symtab_t *symtab = NULL;
static const char *builtin[] = { "localhost", "localnets", static const char *builtin[] = { "localhost", "localnets",
"any", "none"}; "any", "none"};
@ -1216,6 +1217,9 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
} }
} }
tresult = isc_symtab_create(mctx, 100, NULL, NULL, ISC_TRUE, &symtab);
if (tresult != ISC_R_SUCCESS)
result = tresult;
for (velement = cfg_list_first(views); for (velement = cfg_list_first(views);
velement != NULL; velement != NULL;
velement = cfg_list_next(velement)) velement = cfg_list_next(velement))
@ -1226,6 +1230,8 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
cfg_obj_t *vclassobj = cfg_tuple_get(view, "class"); cfg_obj_t *vclassobj = cfg_tuple_get(view, "class");
dns_rdataclass_t vclass = dns_rdataclass_in; dns_rdataclass_t vclass = dns_rdataclass_in;
isc_result_t tresult = ISC_R_SUCCESS; isc_result_t tresult = ISC_R_SUCCESS;
const char *key = cfg_obj_asstring(vname);
isc_symvalue_t symvalue;
if (cfg_obj_isstring(vclassobj)) { if (cfg_obj_isstring(vclassobj)) {
isc_textregion_t r; isc_textregion_t r;
@ -1238,12 +1244,34 @@ bind9_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
"view '%s': invalid class %s", "view '%s': invalid class %s",
cfg_obj_asstring(vname), r.base); cfg_obj_asstring(vname), r.base);
} }
if (tresult == ISC_R_SUCCESS && symtab != NULL) {
symvalue.as_pointer = view;
tresult = isc_symtab_define(symtab, key, vclass,
symvalue,
isc_symexists_reject);
if (tresult == ISC_R_EXISTS) {
const char *file;
unsigned int line;
RUNTIME_CHECK(isc_symtab_lookup(symtab, key,
vclass, &symvalue) == ISC_R_SUCCESS);
file = cfg_obj_file(symvalue.as_pointer);
line = cfg_obj_line(symvalue.as_pointer);
cfg_obj_log(view, logctx, ISC_LOG_ERROR,
"view '%s': already exists "
"previous definition: %s:%u",
key, file, line);
result = tresult;
} else if (result != ISC_R_SUCCESS)
result = tresult;
}
if (tresult == ISC_R_SUCCESS) if (tresult == ISC_R_SUCCESS)
tresult = check_viewconf(config, voptions, tresult = check_viewconf(config, voptions,
vclass, logctx, mctx); vclass, logctx, mctx);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
} }
if (symtab != NULL)
isc_symtab_destroy(&symtab);
if (views != NULL && options != NULL) { if (views != NULL && options != NULL) {
obj = NULL; obj = NULL;