diff --git a/CHANGES b/CHANGES index f0f962129c..7caeffbf0e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ + + 914. [bug] Gobal 'server' statements were rejected when + using views, even though they were accepted + in 9.1. [RT #1368] + 913. [bug] More max-cache-size tuning. 912. [bug] Attempts to set the 'additional-from-cache' or diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c index 48d5483541..34e78ee58d 100644 --- a/lib/isccfg/check.c +++ b/lib/isccfg/check.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.c,v 1.11 2001/06/04 21:51:27 bwelling Exp $ */ +/* $Id: check.c,v 1.12 2001/06/28 21:58:54 gson Exp $ */ #include @@ -413,7 +413,6 @@ cfg_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { result = ISC_R_FAILURE; } else { cfg_obj_t *zones = NULL; - cfg_obj_t *peers = NULL; (void)cfg_map_get(config, "zone", &zones); if (zones != NULL) { @@ -422,14 +421,6 @@ cfg_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { "all zones must be in views"); result = ISC_R_FAILURE; } - - (void)cfg_map_get(config, "server", &peers); - if (peers != NULL) { - cfg_obj_log(peers, logctx, ISC_LOG_ERROR, - "when using 'view' statements, " - "all server statements must be in views"); - result = ISC_R_FAILURE; - } } for (velement = cfg_list_first(views);