From: Mark Andrews <marka@isc.org>
Date: Thu, 25 Feb 2021 23:00:09 +0000 (+1100)
Subject: inline-signing should have been in zone_only_clauses
X-Git-Tag: v9.17.13~16^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3301da262584b12b58941abd2bf104c2ea42c6d;p=thirdparty%2Fbind9.git

inline-signing should have been in zone_only_clauses
---

diff --git a/bin/named/config.c b/bin/named/config.c
index b11e0c9df67..3e23ed0a7b9 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -225,7 +225,7 @@ options {\n\
 	dnssec-update-mode maintain;\n\
 #	forward <none>\n\
 #	forwarders <none>\n\
-	inline-signing no;\n\
+#	inline-signing no;\n\
 	ixfr-from-differences false;\n\
 #	maintain-ixfr-base <obsolete>;\n\
 #	max-ixfr-log-size <obsolete>\n\
diff --git a/bin/named/named.conf.rst b/bin/named/named.conf.rst
index 87a8d12cd8f..bb4003ac1ca 100644
--- a/bin/named/named.conf.rst
+++ b/bin/named/named.conf.rst
@@ -276,7 +276,6 @@ OPTIONS
   	hostname ( quoted_string | none );
   	http-port integer;
   	https-port integer;
-  	inline-signing boolean;
   	interface-interval duration;
   	ipv4only-contact string;
   	ipv4only-enable boolean;
@@ -666,7 +665,6 @@ VIEW
   	forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
   	    | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
   	glue-cache boolean;// deprecated
-  	inline-signing boolean;
   	ipv4only-contact string;
   	ipv4only-enable boolean;
   	ipv4only-server string;
diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 41a3a112d91..35872a5ad12 100644
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -343,7 +343,6 @@ options {
       hostname ( quoted_string | none );
       http\-port integer;
       https\-port integer;
-      inline\-signing boolean;
       interface\-interval duration;
       ipv4only\-contact string;
       ipv4only\-enable boolean;
@@ -765,7 +764,6 @@ view string [ class ] {
       forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
           | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
       glue\-cache boolean;// deprecated
-      inline\-signing boolean;
       ipv4only\-contact string;
       ipv4only\-enable boolean;
       ipv4only\-server string;
diff --git a/doc/misc/options b/doc/misc/options
index a297bf9e000..6a035d686e7 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -200,7 +200,6 @@ options {
         hostname ( <quoted_string> | none );
         http-port <integer>;
         https-port <integer>;
-        inline-signing <boolean>;
         interface-interval <duration>;
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
@@ -550,7 +549,6 @@ view <string> [ <class> ] {
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
         glue-cache <boolean>; // deprecated
-        inline-signing <boolean>;
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
         ipv4only-server <string>;
diff --git a/doc/misc/options.active b/doc/misc/options.active
index c103a5e4b81..c8c56ea4273 100644
--- a/doc/misc/options.active
+++ b/doc/misc/options.active
@@ -199,7 +199,6 @@ options {
         hostname ( <quoted_string> | none );
         http-port <integer>;
         https-port <integer>;
-        inline-signing <boolean>;
         interface-interval <duration>;
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
@@ -547,7 +546,6 @@ view <string> [ <class> ] {
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
         glue-cache <boolean>; // deprecated
-        inline-signing <boolean>;
         ipv4only-contact <string>;
         ipv4only-enable <boolean>;
         ipv4only-server <string>;
diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index 5176f572bd6..5a4c4290f64 100644
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -121,7 +121,6 @@
   	hostname ( <quoted_string> | none );
   	http-port <integer>;
   	https-port <integer>;
-  	inline-signing <boolean>;
   	interface-interval <duration>;
   	ipv4only-contact <string>;
   	ipv4only-enable <boolean>;
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 56fc96b407f..59c2e57e9f0 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2194,8 +2194,6 @@ static cfg_clausedef_t zone_clauses[] = {
 	{ "forwarders", &cfg_type_portiplist,
 	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_STUB |
 		  CFG_ZONE_STATICSTUB | CFG_ZONE_FORWARD },
-	{ "inline-signing", &cfg_type_boolean,
-	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE },
 	{ "key-directory", &cfg_type_qstring,
 	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE },
 	{ "maintain-ixfr-base", NULL, CFG_CLAUSEFLAG_ANCIENT },
@@ -2305,6 +2303,8 @@ static cfg_clausedef_t zone_only_clauses[] = {
 	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MIRROR | CFG_ZONE_STUB |
 		  CFG_ZONE_HINT | CFG_ZONE_REDIRECT },
 	{ "in-view", &cfg_type_astring, CFG_ZONE_INVIEW },
+	{ "inline-signing", &cfg_type_boolean,
+	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE },
 	{ "ixfr-base", NULL, CFG_CLAUSEFLAG_ANCIENT },
 	{ "ixfr-from-differences", &cfg_type_boolean,
 	  CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MIRROR },