mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

inline-signing should have been in zone_only_clauses

Browse Source
This commit is contained in:
Mark Andrews
2021-02-26 10:00:09 +11:00
parent 74d9a917eb
commit b3301da262
7 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/named/config.c
View File

@@ -225,7 +225,7 @@ options {\n\
dnssec-update-mode maintain;\n\ dnssec-update-mode maintain;\n\
# forward <none>\n\ # forward <none>\n\
# forwarders <none>\n\ # forwarders <none>\n\
inline-signing no;\n\ # inline-signing no;\n\
ixfr-from-differences false;\n\ ixfr-from-differences false;\n\
# maintain-ixfr-base <obsolete>;\n\ # maintain-ixfr-base <obsolete>;\n\
# max-ixfr-log-size <obsolete>\n\ # max-ixfr-log-size <obsolete>\n\

2
bin/named/named.conf.rst
View File

@@ -276,7 +276,6 @@ OPTIONS
hostname ( quoted_string | none ); hostname ( quoted_string | none );
http-port integer; http-port integer;
https-port integer; https-port integer;
inline-signing boolean;
interface-interval duration; interface-interval duration;
ipv4only-contact string; ipv4only-contact string;
ipv4only-enable boolean; ipv4only-enable boolean;
@@ -666,7 +665,6 @@ VIEW
forwarders [ port integer ] [ dscp integer ] { ( ipv4_address forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
| ipv6_address ) [ port integer ] [ dscp integer ]; ... }; | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
glue-cache boolean;// deprecated glue-cache boolean;// deprecated
inline-signing boolean;
ipv4only-contact string; ipv4only-contact string;
ipv4only-enable boolean; ipv4only-enable boolean;
ipv4only-server string; ipv4only-server string;

2
doc/man/named.conf.5in
View File

@@ -343,7 +343,6 @@ options {
hostname ( quoted_string | none ); hostname ( quoted_string | none );
http\-port integer; http\-port integer;
https\-port integer; https\-port integer;
inline\-signing boolean;
interface\-interval duration; interface\-interval duration;
ipv4only\-contact string; ipv4only\-contact string;
ipv4only\-enable boolean; ipv4only\-enable boolean;
@@ -765,7 +764,6 @@ view string [ class ] {
forwarders [ port integer ] [ dscp integer ] { ( ipv4_address forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
| ipv6_address ) [ port integer ] [ dscp integer ]; ... }; | ipv6_address ) [ port integer ] [ dscp integer ]; ... };
glue\-cache boolean;// deprecated glue\-cache boolean;// deprecated
inline\-signing boolean;
ipv4only\-contact string; ipv4only\-contact string;
ipv4only\-enable boolean; ipv4only\-enable boolean;
ipv4only\-server string; ipv4only\-server string;

2
doc/misc/options
View File

@@ -200,7 +200,6 @@ options {
hostname ( <quoted_string> | none ); hostname ( <quoted_string> | none );
http-port <integer>; http-port <integer>;
https-port <integer>; https-port <integer>;
inline-signing <boolean>;
interface-interval <duration>; interface-interval <duration>;
ipv4only-contact <string>; ipv4only-contact <string>;
ipv4only-enable <boolean>; ipv4only-enable <boolean>;
@@ -550,7 +549,6 @@ view <string> [ <class> ] {
forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
| <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... }; | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
glue-cache <boolean>; // deprecated glue-cache <boolean>; // deprecated
inline-signing <boolean>;
ipv4only-contact <string>; ipv4only-contact <string>;
ipv4only-enable <boolean>; ipv4only-enable <boolean>;
ipv4only-server <string>; ipv4only-server <string>;

2
doc/misc/options.active
View File

@@ -199,7 +199,6 @@ options {
hostname ( <quoted_string> | none ); hostname ( <quoted_string> | none );
http-port <integer>; http-port <integer>;
https-port <integer>; https-port <integer>;
inline-signing <boolean>;
interface-interval <duration>; interface-interval <duration>;
ipv4only-contact <string>; ipv4only-contact <string>;
ipv4only-enable <boolean>; ipv4only-enable <boolean>;
@@ -547,7 +546,6 @@ view <string> [ <class> ] {
forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
| <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... }; | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
glue-cache <boolean>; // deprecated glue-cache <boolean>; // deprecated
inline-signing <boolean>;
ipv4only-contact <string>; ipv4only-contact <string>;
ipv4only-enable <boolean>; ipv4only-enable <boolean>;
ipv4only-server <string>; ipv4only-server <string>;

1
doc/misc/options.grammar.rst
View File

@@ -121,7 +121,6 @@
hostname ( <quoted_string> | none ); hostname ( <quoted_string> | none );
http-port <integer>; http-port <integer>;
https-port <integer>; https-port <integer>;
inline-signing <boolean>;
interface-interval <duration>; interface-interval <duration>;
ipv4only-contact <string>; ipv4only-contact <string>;
ipv4only-enable <boolean>; ipv4only-enable <boolean>;

4
lib/isccfg/namedconf.c
View File

@@ -2194,8 +2194,6 @@ static cfg_clausedef_t zone_clauses[] = {
{ "forwarders", &cfg_type_portiplist, { "forwarders", &cfg_type_portiplist,
CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_STUB | CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_STUB |
CFG_ZONE_STATICSTUB | CFG_ZONE_FORWARD }, CFG_ZONE_STATICSTUB | CFG_ZONE_FORWARD },
{ "inline-signing", &cfg_type_boolean,
CFG_ZONE_MASTER | CFG_ZONE_SLAVE },
{ "key-directory", &cfg_type_qstring, { "key-directory", &cfg_type_qstring,
CFG_ZONE_MASTER | CFG_ZONE_SLAVE }, CFG_ZONE_MASTER | CFG_ZONE_SLAVE },
{ "maintain-ixfr-base", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "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_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MIRROR | CFG_ZONE_STUB |
CFG_ZONE_HINT | CFG_ZONE_REDIRECT }, CFG_ZONE_HINT | CFG_ZONE_REDIRECT },
{ "in-view", &cfg_type_astring, CFG_ZONE_INVIEW }, { "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-base", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "ixfr-from-differences", &cfg_type_boolean, { "ixfr-from-differences", &cfg_type_boolean,
CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MIRROR }, CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MIRROR },