2015. [cleanup] use-additional-cache is now acache-enable for

                        consistancy.  Default acache-enable off in BIND 9.4
                        as it requires memory usage to be configured.
                        It may be enabled by default in BIND 9.5 once we
                        have more experience with it.

diff --git a/CHANGES b/CHANGES
index 9e927c132dfb10185a4c65cd281abffdcbb69f69..9dd9580d0b641cfa4c3f8b39ef618e0ca4c092ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2015.  [cleanup]       use-additional-cache is now acache-enable for
+                       consistancy.  Default acache-enable off in BIND 9.4
+                       as it requires memory usage to be configured.
+                       It may be enabled by default in BIND 9.5 once we
+                       have more experience with it.
+
 2014.  [func]          Statistics about acache now recorded and sent
                        to log. [RT #15976]
 

diff --git a/bin/named/config.c b/bin/named/config.c
index 67e96341c9ba1b4d78857f3d68018b3f86f25d33..6a6d5e3e9e988890209f7fd60a31953c404e9930 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.47.18.27 2006/03/09 23:38:20 marka Exp $ */
+/* $Id: config.c,v 1.47.18.28 2006/05/03 01:46:40 marka Exp $ */
 
 /*! \file */
 
@@ -132,7 +132,7 @@ options {\n\
        check-names slave warn;\n\
        check-names response ignore;\n\
        check-mx warn;\n\
-       use-additional-cache true;\n\
+       acache-enable no;\n\
        acache-cleaning-interval 60;\n\
        max-acache-size 0;\n\
        dnssec-enable yes;\n\

diff --git a/bin/named/server.c b/bin/named/server.c
index e2bd0ca59f828a0557d0b1a2d3dbe2c8587ac894..c40228ffcdedbf9587f38d3f40b0c8780201befe 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.419.18.44 2006/03/09 23:46:20 marka Exp $ */
+/* $Id: server.c,v 1.419.18.45 2006/05/03 01:46:40 marka Exp $ */
 
 /*! \file */
 
@@ -968,11 +968,12 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
 
        /*
         * Create additional cache for this view and zones under the view
-        * unless explicitly disabled.
+        * if explicitly enabled.
+        * XXX950 default to on.
         */
        obj = NULL;
-       (void)ns_config_get(maps, "use-additional-cache", &obj);
-       if (obj == NULL || cfg_obj_asboolean(obj)) {
+       (void)ns_config_get(maps, "acache-enable", &obj);
+       if (obj != NULL && cfg_obj_asboolean(obj)) {
                cmctx = NULL;
                CHECK(isc_mem_create(0, 0, &cmctx));
                CHECK(dns_acache_create(&view->acache, cmctx, ns_g_taskmgr,

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 078671ce4673079d1332236d82df88a6950dcd9c..82950f05a1056cf6fc78d70d48a1dec703646af4 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.241.18.56 2006/03/09 23:38:20 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.241.18.57 2006/05/03 01:46:40 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -4492,7 +4492,7 @@ category notify { null; };
     <optional> root-delegation-only <optional> exclude { <replaceable>namelist</replaceable> } </optional> ; </optional>
     <optional> querylog <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> disable-algorithms <replaceable>domain</replaceable> { <replaceable>algorithm</replaceable>; <optional> <replaceable>algorithm</replaceable>; </optional> }; </optional>
-    <optional> use-additional-cache <replaceable>yes_or_no</replaceable> ; </optional>
+    <optional> acache-enable <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> acache-cleaning-interval <replaceable>number</replaceable>; </optional>
     <optional> max-acache-size <replaceable>size_spec</replaceable> ; </optional>
     <optional> clients-per-query <replaceable>number</replaceable> ; </optional>
@@ -7508,7 +7508,7 @@ query-source-v6 address * port *;
             Thus, if the response performance does not matter and memory
             consumption is much more critical, the
             <command>acache</command> mechanism can be
-            disabled by setting <command>use-additional-cache</command> to
+            disabled by setting <command>acache-enable</command> to
             <command>no</command>.
             It is also possible to specify the upper limit of memory
             consumption
@@ -7540,11 +7540,11 @@ query-source-v6 address * port *;
           <variablelist>
 
             <varlistentry>
-              <term><command>use-additional-cache</command></term>
+              <term><command>acache-enable</command></term>
               <listitem>
                 <para>
-                  If <command>yes</command>, additional section caching is enabled.
-                  The default value is <command>yes</command>.
+                  If <command>yes</command>, additional section caching is
+                 enabled.  The default value is <command>no</command>.
                 </para>
               </listitem>
             </varlistentry>

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index a009a1f45a80582fa02744af41b863d404c56546..65e30a2f3732ca929a15892028ee0bd62a86a36c 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.30.18.37 2006/03/09 23:38:21 marka Exp $ */
+/* $Id: namedconf.c,v 1.30.18.38 2006/05/03 01:46:40 marka Exp $ */
 
 /*! \file */
 
@@ -774,7 +774,7 @@ view_clauses[] = {
           CFG_CLAUSEFLAG_MULTI },
        { "dnssec-accept-expired", &cfg_type_boolean, 0 },
        { "ixfr-from-differences", &cfg_type_ixfrdifftype, 0 },
-       { "use-additional-cache", &cfg_type_boolean, 0 },
+       { "acache-enable", &cfg_type_boolean, 0 },
        { "acache-cleaning-interval", &cfg_type_uint32, 0 },
        { "max-acache-size", &cfg_type_sizenodefault, 0 },
        { "clients-per-query", &cfg_type_uint32, 0 },