From: Evan Hunt <each@isc.org>
Date: Wed, 15 Sep 2021 07:56:41 +0000 (-0700)
Subject: deprecate "cache-file"
X-Git-Tag: v9.17.19~36^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a67d008ba525fd11c30e0ca4468121e4b2f6fa1e;p=thirdparty%2Fbind9.git

deprecate "cache-file"

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

diff --git a/CHANGES b/CHANGES
index a402caee4c3..254cdb04771 100644
--- 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 fe28c894c8d..2d02ede4617 100644
--- 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 92d979d68df..d765f806b6f 100644
--- 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 49525fefbd3..b18ae01287d 100644
--- 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 a97296f59b1..575cc2e47f0 100644
--- 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 5ce42dfbff6..38e73d8caea 100644
--- 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 },