deprecate "cache-file"

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

diff --git a/CHANGES b/CHANGES
index a402caee4c3a1cdc37d7d137d2cc5e53366b529e..254cdb04771d3ea2f4bbc66066f7776d270b1827 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5717.  [func]          The "cache-file" option has been marked as
+                       deprecated. [GL #2903]
+
 5716.  [placeholder]
 
 5715.  [func]          Add a check when the *-source(-v6) clashes with the

diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index fe28c894c8d4d7a6436768a9c7b90d7704cf91c0..2d02ede4617ce4884cbda92ce2c9108406459cd8 100644 (file)
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -186,7 +186,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
@@ -620,7 +620,7 @@ VIEW
        attach-cache string;
        auth-nxdomain boolean;
        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 92d979d68df411fb4a825a009dfdc32f3f1a0d64..d765f806b6feb289700adefc1bd10784555c15bf 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
@@ -499,7 +499,7 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>;
         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 49525fefbd3446c6b51cfa4dc4ce2973119d49da..b18ae01287d9d4cc460b2d0fb56eecb32ad622a0 100644 (file)
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -109,7 +109,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
@@ -496,7 +496,7 @@ view <string> [ <class> ] {
         attach-cache <string>;
         auth-nxdomain <boolean>;
         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 a97296f59b1e1ad265bf248289c2808991f6c819..575cc2e47f03be72c448518fa31a12c917e2e348 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -29,7 +29,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 5ce42dfbff63ebfa669ee5fab9d3619244235de0..38e73d8caea1701ea1b2124d67887b2e44d971cc 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1990,7 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
        { "allow-v6-synthesis", NULL, CFG_CLAUSEFLAG_ANCIENT },
        { "attach-cache", &cfg_type_astring, 0 },
        { "auth-nxdomain", &cfg_type_boolean, 0 },
-       { "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", NULL, CFG_CLAUSEFLAG_ANCIENT },