deprecate "cache-file"

this commit marks the "cache-file" option as deprecated.

(cherry picked from commit a67d008ba525fd11c30e0ca4468121e4b2f6fa1e)

diff --git a/CHANGES b/CHANGES
index 5340ffa78dbcc0a9bccef2f3de6e2cd138ab3a0b..d0c06f77f74ebab18958c0a8f5eee492bee328d0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5717.  [func]          The "cache-file" option has been marked as
+                       deprecated. [GL #2903]
+
 5716.  [bug]           Multiple library names were mistakenly passed to the
                        krb5-config utility when ./configure was invoked with
                        the --with-gssapi=[/path/to/]krb5-config option. This

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index 88b6df3c4336d23b3d7ab262be266857c096929f..181d487b0d6937d64fb1fe92038a12bcf169ef58 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -184,7 +184,7 @@ OPTIONS
        avoid-v6-udp-ports { portrange; ... };
        bindkeys-file quoted_string;
        blackhole { address_match_element; ... };
-       cache-file quoted_string;
+       cache-file quoted_string;// deprecated
        catalog-zones { zone string [ default-masters [ port integer ]
            [ dscp integer ] { ( remote-servers | ipv4_address [ port
            integer ] | ipv6_address [ port integer ] ) [ key
@@ -583,7 +583,7 @@ VIEW
        attach-cache string;
        auth-nxdomain boolean; // default changed
        auto-dnssec ( allow | maintain | off );
-       cache-file quoted_string;
+       cache-file quoted_string;// deprecated
        catalog-zones { zone string [ default-masters [ port integer ]
            [ dscp integer ] { ( remote-servers | ipv4_address [ port
            integer ] | ipv6_address [ port integer ] ) [ key

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index ff6c7bb0320d1dfc6afb844d6e79d8fe5fe16774..8289b9936490fa222bfce3c27ffd8f4de398e8a8 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -237,7 +237,7 @@ options {
       avoid\-v6\-udp\-ports { portrange; ... };
       bindkeys\-file quoted_string;
       blackhole { address_match_element; ... };
-      cache\-file quoted_string;
+      cache\-file quoted_string;// deprecated
       catalog\-zones { zone string [ default\-masters [ port integer ]
           [ dscp integer ] { ( remote\-servers | ipv4_address [ port
           integer ] | ipv6_address [ port integer ] ) [ key
@@ -668,7 +668,7 @@ view string [ class ] {
       attach\-cache string;
       auth\-nxdomain boolean; // default changed
       auto\-dnssec ( allow | maintain | off );
-      cache\-file quoted_string;
+      cache\-file quoted_string;// deprecated
       catalog\-zones { zone string [ default\-masters [ port integer ]
           [ dscp integer ] { ( remote\-servers | ipv4_address [ port
           integer ] | ipv6_address [ port integer ] ) [ key

diff --git a/doc/misc/options b/doc/misc/options
index 258168741500ba4579f121950fbe39e2ecaa6e30..36cf69f45d1518f69816584a49c90e4477e2c4f0 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -110,7 +110,7 @@ options {
         avoid-v6-udp-ports { <portrange>; ... };
         bindkeys-file <quoted_string>;
         blackhole { <address_match_element>; ... };
-        cache-file <quoted_string>;
+        cache-file <quoted_string>; // deprecated
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
             [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
             <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
@@ -510,7 +510,7 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>; // default changed
         auto-dnssec ( allow | maintain | off );
-        cache-file <quoted_string>;
+        cache-file <quoted_string>; // deprecated
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
             [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
             <integer> ] | <ipv6_address> [ port <integer> ] ) [ key

diff --git a/doc/misc/options.active b/doc/misc/options.active
index 356b7c24f27314dae8a35369a28b4fbffbf38ec7..256006d0399c28927e23c2303486f3a2afb2a82e 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -102,7 +102,7 @@ options {
         avoid-v6-udp-ports { <portrange>; ... };
         bindkeys-file <quoted_string>;
         blackhole { <address_match_element>; ... };
-        cache-file <quoted_string>;
+        cache-file <quoted_string>; // deprecated
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
             [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
             <integer> ] | <ipv6_address> [ port <integer> ] ) [ key
@@ -459,7 +459,7 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>; // default changed
         auto-dnssec ( allow | maintain | off );
-        cache-file <quoted_string>;
+        cache-file <quoted_string>; // deprecated
         catalog-zones { zone <string> [ default-masters [ port <integer> ]
             [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
             <integer> ] | <ipv6_address> [ port <integer> ] ) [ key

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index aa20b0db5d55388ce233323f4aa0602541dbb665..8562e5d30fc989adb2b2e82a696ea0a8fcb929aa 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -28,7 +28,7 @@
        avoid-v6-udp-ports { <portrange>; ... };
        bindkeys-file <quoted_string>;
        blackhole { <address_match_element>; ... };
-       cache-file <quoted_string>;
+       cache-file <quoted_string>; // deprecated
        catalog-zones { zone <string> [ default-masters [ port <integer> ]
            [ dscp <integer> ] { ( <remote-servers> | <ipv4_address> [ port
            <integer> ] | <ipv6_address> [ port <integer> ] ) [ key

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 1f1cdde181262b2c7655fa71c8de5b4d00fb9b41..5dea4b491f9d549312989afc2dd9edc1cbf04d2c 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1991,7 +1991,7 @@ static cfg_clausedef_t view_clauses[] = {
          CFG_CLAUSEFLAG_OBSOLETE },
        { "attach-cache", &cfg_type_astring, 0 },
        { "auth-nxdomain", &cfg_type_boolean, CFG_CLAUSEFLAG_NEWDEFAULT },
-       { "cache-file", &cfg_type_qstring, 0 },
+       { "cache-file", &cfg_type_qstring, CFG_CLAUSEFLAG_DEPRECATED },
        { "catalog-zones", &cfg_type_catz, 0 },
        { "check-names", &cfg_type_checknames, CFG_CLAUSEFLAG_MULTI },
        { "cleaning-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },