From 1a4d687359d89ff3b3e4e3f7acc4b6b8d8c982e9 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 17 Apr 2003 12:11:39 +0000 Subject: [PATCH] 1468. [func] Internal zones are nolonger for 'rndc status'. [RT #4706] --- CHANGES | 3 +++ bin/named/config.c | 5 ++++- lib/dns/zone.c | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e0e6a7fe41..7affc094fb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1468. [func] Internal zones are nolonger for 'rndc status'. + [RT #4706] + 1467. [func] $GENERATES now supports optional class and ttl. 1466. [bug] lwresd configuration errors resulted in memory diff --git a/bin/named/config.c b/bin/named/config.c index 622efab0a5..4df6150861 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.41 2003/02/27 05:12:47 marka Exp $ */ +/* $Id: config.c,v 1.42 2003/04/17 12:11:39 marka Exp $ */ #include @@ -153,6 +153,9 @@ options {\n\ ixfr-from-differences false;\n\ };\n\ \n\ +#\n\ +# Zones in the \"_bind\" view are NOT counted is the count of zones.\n\ +#\n\ view \"_bind\" chaos {\n\ recursion no;\n\ \n\ diff --git a/lib/dns/zone.c b/lib/dns/zone.c index f178e688ad..c61039f5e1 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.386 2003/03/23 13:18:53 jinmei Exp $ */ +/* $Id: zone.c,v 1.387 2003/04/17 12:11:39 marka Exp $ */ #include @@ -6592,8 +6592,12 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) { case DNS_ZONESTATE_ANY: for (zone = ISC_LIST_HEAD(zmgr->zones); zone != NULL; - zone = ISC_LIST_NEXT(zone, link)) + zone = ISC_LIST_NEXT(zone, link)) { + dns_view_t *view = zone->view; + if (view != NULL && strcmp(view->name, "_bind") == 0) + continue; count++; + } break; default: INSIST(0);