upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2536-inline-signing-documentation-doesn-t-match-reality' into 'main'

Browse source 
Resolve "inline-signing documentation doesn't match reality"

Closes #2536

See merge request isc-projects/bind9!4751
This commit is contained in:
Mark Andrews 2021-05-05 00:17:40 +00:00
commit 0f53872542
11 changed files with 65 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,3 +1,8 @@
5633. [doc] Inline-signing was incorrectly described as being
inherited from the options / view levels and was
incorrectly accepted at those levels without effect.
This has been corrected. [GL #2536]
5632. [func] Add built-in dnssec-policy "insecure". This is used to
transition a zone from a signed state to a unsigned
state. [GL #2645]

2
bin/named/config.c
View file

@ -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\

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

@ -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;

22
bin/tests/system/checkconf/bad-inline-options.conf Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
/*
* inline-signing not allowed at options level.
*/
options {
inline-signing yes;
};
zone "." {
type primary;
file "root.db";
};

29
bin/tests/system/checkconf/bad-inline-view.conf Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
/*
* inline-signing not allowed at view level.
*/
view "a" {
inline-signing yes;
zone "." {
type primary;
file "root.db.signed";
};
};
view "b" {
zone "." {
type primary;
file "root.db";
};
};

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

@ -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;

2
doc/misc/options
View file

@ -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>;

2
doc/misc/options.active
View file

@ -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>;

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

@ -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>;

6
doc/notes/notes-current.rst
View file

@ -54,6 +54,12 @@ Feature Changes
``dnssec-policy`` to ``insecure`` will cause CDS and CDNSKEY DELETE records
to be published. :gl:`#2645`
- ``inline-signing`` was incorrectly described as being inherited from the
``options`` or ``view`` levels and was incorrectly accepted at those levels
without effect. This has been corrected, ``named.conf`` files with
``inline-signing`` at those levels will no longer load with this fix applied.
:gl:`#2536`
Bug Fixes
~~~~~~~~~

4
lib/isccfg/namedconf.c
View file

@ -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 },