1468. [func] Internal zones are nolonger for 'rndc status'.

                        [RT #4706]

diff --git a/CHANGES b/CHANGES
index e0e6a7fe41abea6c9029254a0aa2438044abd20c..7affc094fb6001bf77a462eb667cfc564997eaa2 100644 (file)
--- 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 622efab0a5a0f63d6decab94c9cbd96524d07bde..4df61508614e00bdb4e6ad1d1c942f8ed7dec363 100644 (file)
--- 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 <config.h>
 
@@ -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 f178e688ad09e5618b66cf418dcc0064b7820bb9..c61039f5e198740dc63b52f111bba5dec0361af6 100644 (file)
--- 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 <config.h>
 
@@ -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);