Remove the auto-dnssec option

Mark the "auto-dnssec" option ancient (effectively disallowing it from
the configuration).

diff --git a/doc/misc/options b/doc/misc/options
index dd33c52f14c31adf615ad149833fe1e7bd67a854..2a2847dd90f93863b955c3de7cbc81002634579d 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -74,7 +74,6 @@ options {
        answer-cookie <boolean>;
        attach-cache <string>;
        auth-nxdomain <boolean>;
-       auto-dnssec ( allow | maintain | off ); // deprecated
        automatic-interface-scan <boolean>;
        avoid-v4-udp-ports { <portrange>; ... }; // deprecated
        avoid-v6-udp-ports { <portrange>; ... }; // deprecated
@@ -378,7 +377,6 @@ view <string> [ <class> ] {
        also-notify [ port <integer> ] [ source ( <ipv4_address> | * ) ] [ source-v6 ( <ipv6_address> | * ) ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        attach-cache <string>;
        auth-nxdomain <boolean>;
-       auto-dnssec ( allow | maintain | off ); // deprecated
        catalog-zones { zone <string> [ default-primaries [ port <integer> ] [ source ( <ipv4_address> | * ) ] [ source-v6 ( <ipv6_address> | * ) ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone-directory <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval <duration> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;

diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt
index dd5f8b65724126696749cc1da9f6361b18002675..313ed21f8c742b7e971e5243af3d4171b553faae 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -5,7 +5,6 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        also-notify [ port <integer> ] [ source ( <ipv4_address> | * ) ] [ source-v6 ( <ipv6_address> | * ) ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       auto-dnssec ( allow | maintain | off ); // deprecated
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;
        check-mx ( fail | warn | ignore );

diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt
index 6139782989391991f59267c0c949f5118392bec0..523dd74cc1fa1064015b76d7c7018b9f793bed15 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -6,7 +6,6 @@ zone <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
        also-notify [ port <integer> ] [ source ( <ipv4_address> | * ) ] [ source-v6 ( <ipv6_address> | * ) ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       auto-dnssec ( allow | maintain | off ); // deprecated
        check-names ( fail | warn | ignore );
        checkds ( explicit | <boolean> );
        database <string>;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 3d3153e37456af2325ebf343683539efadc59714..7a3e47869ed96e5ab3055b7cfafc097a340b7d23 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2262,7 +2262,7 @@ static cfg_clausedef_t zone_clauses[] = {
          CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
                  CFG_CLAUSEFLAG_ANCIENT },
        { "auto-dnssec", &cfg_type_autodnssec,
-         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_CLAUSEFLAG_DEPRECATED },
+         CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_CLAUSEFLAG_ANCIENT },
        { "check-dup-records", &cfg_type_checkmode, CFG_ZONE_PRIMARY },
        { "check-integrity", &cfg_type_boolean, CFG_ZONE_PRIMARY },
        { "check-mx", &cfg_type_checkmode, CFG_ZONE_PRIMARY },