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

1612. [bug] check-names at the option/view level could trigger

Browse Source 
an INSIST. [RT# 11116]
This commit is contained in:
Mark Andrews 2004-04-20 14:11:47 +00:00
parent 349f684cf1
commit 1cf54d1966
5 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -18,7 +18,8 @@
Missing #ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX/#endif.
[RT #11119]
1612. [placeholder] rt11116
1612. [bug] check-names at the option/view level could trigger
an INSIST. [RT# 11116]
1611. [bug] solaris: IPv6 interface scanning failed to cope with
no active IPv6 interfaces.

37
bin/named/config.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.c,v 1.48 2004/04/19 23:09:51 marka Exp $ */
/* $Id: config.c,v 1.49 2004/04/20 14:11:46 marka Exp $ */
#include <config.h>
@ -206,6 +206,41 @@ ns_config_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj) {
}
}
isc_result_t
ns_checknames_get(cfg_obj_t **maps, const char *which, cfg_obj_t **obj) {
cfg_listelt_t *element;
cfg_obj_t *checknames;
cfg_obj_t *type;
cfg_obj_t *value;
int i;
for (i = 0;; i++) {
if (maps[i] == NULL)
return (ISC_R_NOTFOUND);
checknames = NULL;
if (cfg_map_get(maps[i], "check-names", &checknames) == ISC_R_SUCCESS) {
/*
* Zone map entry is not a list.
*/
if (checknames != NULL && !cfg_obj_islist(checknames)) {
*obj = checknames;
return (ISC_R_SUCCESS);
}
for (element = cfg_list_first(checknames);
element != NULL;
element = cfg_list_next(element)) {
value = cfg_listelt_value(element);
type = cfg_tuple_get(value, "type");
if (strcasecmp(cfg_obj_asstring(type), which) == 0) {
*obj = cfg_tuple_get(value, "mode");
return (ISC_R_SUCCESS);
}
}
}
}
}
int
ns_config_listcount(cfg_obj_t *list) {
cfg_listelt_t *e;

5
bin/named/include/named/config.h
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.h,v 1.6 2004/03/05 04:57:55 marka Exp $ */
/* $Id: config.h,v 1.7 2004/04/20 14:11:47 marka Exp $ */
#ifndef NAMED_CONFIG_H
#define NAMED_CONFIG_H 1
@ -31,6 +31,9 @@ ns_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf);
isc_result_t
ns_config_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
isc_result_t
ns_checknames_get(cfg_obj_t **maps, const char* name, cfg_obj_t **obj);
int
ns_config_listcount(cfg_obj_t *list);

17
bin/named/server.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.424 2004/04/20 07:16:23 marka Exp $ */
/* $Id: server.c,v 1.425 2004/04/20 14:11:46 marka Exp $ */
#include <config.h>
@ -857,21 +857,10 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
* Check-names.
*/
obj = NULL;
str = "";
result = ns_config_get(maps, "check-names", &obj);
result = ns_checknames_get(maps, "response", &obj);
INSIST(result == ISC_R_SUCCESS);
for (element = cfg_list_first(obj);
element != NULL;
element = cfg_list_next(element)) {
cfg_obj_t *value, *type;
value = cfg_listelt_value(element);
type = cfg_tuple_get(value, "type");
if (strcasecmp(cfg_obj_asstring(type), "response") == 0) {
str = cfg_obj_asstring(cfg_tuple_get(value, "mode"));
break;
}
}
str = cfg_obj_asstring(obj);
if (strcasecmp(str, "fail") == 0) {
check = DNS_RESOLVER_CHECKNAMES |
DNS_RESOLVER_CHECKNAMESFAIL;

28
bin/named/zoneconf.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.111 2004/03/30 02:13:43 marka Exp $ */
/* $Id: zoneconf.c,v 1.112 2004/04/20 14:11:46 marka Exp $ */
#include <config.h>
@ -295,11 +295,7 @@ strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) {
static void
checknames(dns_zonetype_t ztype, cfg_obj_t **maps, cfg_obj_t **objp) {
const char *zone = NULL;
cfg_listelt_t *element;
cfg_obj_t *type;
cfg_obj_t *value;
cfg_obj_t *check;
int i;
isc_result_t result;
switch (ztype) {
case dns_zone_slave: zone = "slave"; break;
@ -307,24 +303,8 @@ checknames(dns_zonetype_t ztype, cfg_obj_t **maps, cfg_obj_t **objp) {
default:
INSIST(0);
}
for (i = 0; maps[i] != NULL; i++) {
check = NULL;
cfg_map_get(maps[i], "check-names", &check);
if (check != NULL && !cfg_obj_islist(check)) {
*objp = check;
return;
}
for (element = cfg_list_first(check);
element != NULL;
element = cfg_list_next(element)) {
value = cfg_listelt_value(element);
type = cfg_tuple_get(value, "type");
if (strcasecmp(cfg_obj_asstring(type), zone) == 0) {
*objp = cfg_tuple_get(value, "mode");
return;
}
}
}
result = ns_checknames_get(maps, zone, objp);
INSIST(result == ISC_R_SUCCESS);
}
isc_result_t