diff --git a/doc/misc/options b/doc/misc/options index dd33c52f14..2a2847dd90 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -74,7 +74,6 @@ options { answer-cookie ; attach-cache ; auth-nxdomain ; - auto-dnssec ( allow | maintain | off ); // deprecated automatic-interface-scan ; avoid-v4-udp-ports { ; ... }; // deprecated avoid-v6-udp-ports { ; ... }; // deprecated @@ -378,7 +377,6 @@ view [ ] { also-notify [ port ] [ source ( | * ) ] [ source-v6 ( | * ) ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; attach-cache ; auth-nxdomain ; - auto-dnssec ( allow | maintain | off ); // deprecated catalog-zones { zone [ default-primaries [ port ] [ source ( | * ) ] [ source-v6 ( | * ) ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone-directory ] [ in-memory ] [ min-update-interval ]; ... }; check-dup-records ( fail | warn | ignore ); check-integrity ; diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt index dd5f8b6572..313ed21f8c 100644 --- a/doc/misc/primary.zoneopt +++ b/doc/misc/primary.zoneopt @@ -5,7 +5,6 @@ zone [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update { ; ... }; also-notify [ port ] [ source ( | * ) ] [ source-v6 ( | * ) ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - auto-dnssec ( allow | maintain | off ); // deprecated check-dup-records ( fail | warn | ignore ); check-integrity ; check-mx ( fail | warn | ignore ); diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt index 6139782989..523dd74cc1 100644 --- a/doc/misc/secondary.zoneopt +++ b/doc/misc/secondary.zoneopt @@ -6,7 +6,6 @@ zone [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update-forwarding { ; ... }; also-notify [ port ] [ source ( | * ) ] [ source-v6 ( | * ) ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; - auto-dnssec ( allow | maintain | off ); // deprecated check-names ( fail | warn | ignore ); checkds ( explicit | ); database ; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 3d3153e374..7a3e47869e 100644 --- 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 },