inline-signing should have been in zone_only_clauses

diff --git a/bin/named/config.c b/bin/named/config.c
index b11e0c9df678513cb40a3962d71c12b17e1f99d6..3e23ed0a7b9420afc1ee5f8a13ab69e53f9e83dc 100644 (file)
--- 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 87a8d12cd8f5a8f97c0a92f80adad221a72b9624..bb4003ac1ca36f7c4558b05405624099a4e9a0d0 100644 (file)
--- 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 41a3a112d9167eda54086bb0f44ec5f4a549fffd..35872a5ad123b71bd218b6d2b47b3dfcb289e3c0 100644 (file)
--- 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 a297bf9e000607b74cc3c475d0d062bf98bea621..6a035d686e771d681366fa310d00b9a2e6595e77 100644 (file)
--- 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 c103a5e4b81567989ee6da44c4aa7603b9b1a127..c8c56ea42735d21e308fd8ececf669dde97aa428 100644 (file)
--- 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 5176f572bd6f09123577b0a1ac34b740c8bab054..5a4c4290f648cc6574916b5366a767ff54508cbb 100644 (file)
--- 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 56fc96b407f5901f25c6eb97a84027d355f1f869..59c2e57e9f087cfdb86961b83d5e80decb3dee9f 100644 (file)
--- 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 },