Deprecate sortlist option

Mark the sortlist option deprecated, so we can remove it in the
future.

diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf
index 15d719d6a449d75ec55ad6701c2fc49519d3534e..71ea50eb6c1b4f869fdd6e02e660c28df6b74f30 100644 (file)
--- a/bin/tests/system/checkconf/deprecated.conf
+++ b/bin/tests/system/checkconf/deprecated.conf
@@ -28,6 +28,8 @@ options {
        avoid-v6-udp-ports { range 1 1023; };
 
        dnssec-must-be-secure mustbesecure.example yes;
+
+       sortlist { };
 };
 
 trusted-keys {

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 74361fa9cb55d1381f5ebb2d8e6a927f112ac559..76b2986d8dcdb79620d216ee27bf3f13df138242 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -179,6 +179,7 @@ grep "option 'avoid-v6-udp-ports' is deprecated" <checkconf.out$n.1 >/dev/null |
 grep "option 'dialup' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
 grep "option 'heartbeat-interval' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
 grep "option 'dnssec-must-be-secure' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
+grep "option 'sortlist' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
 grep "token 'port' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status + ret))

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index e4f1b1cc7a2f14a9bb60fb678fe3b2aa212950cb..dc11db525e1621fadfa842a2b61fbd71d059291f 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4014,9 +4014,11 @@ client's address. This only requires configuring the name servers, not
 all the clients.
 
 .. namedconf:statement:: sortlist
-   :tags: query
+   :tags: query, deprecated
    :short: Controls the ordering of RRs returned to the client, based on the client's IP address.
 
+   This option is deprecated and will be removed in a future release.
+
    The :any:`sortlist` statement (see below) takes an :term:`address_match_list` and
    interprets it in a special way. Each top-level statement in the :any:`sortlist`
    must itself be an explicit :term:`address_match_list` with one or two elements. The

diff --git a/doc/misc/options b/doc/misc/options
index 31efabbc1594af300b83d4998032389eeb7a0453..1142bb6f185b85cdddf3dde55ea56758cb0e2255 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -274,7 +274,7 @@ options {
        sig-signing-signatures <integer>;
        sig-signing-type <integer>;
        sig-validity-interval <integer> [ <integer> ]; // obsolete
-       sortlist { <address_match_element>; ... };
+       sortlist { <address_match_element>; ... }; // deprecated
        stale-answer-client-timeout ( disabled | off | <integer> );
        stale-answer-enable <boolean>;
        stale-answer-ttl <duration>;
@@ -569,7 +569,7 @@ view <string> [ <class> ] {
        sig-signing-signatures <integer>;
        sig-signing-type <integer>;
        sig-validity-interval <integer> [ <integer> ]; // obsolete
-       sortlist { <address_match_element>; ... };
+       sortlist { <address_match_element>; ... }; // deprecated
        stale-answer-client-timeout ( disabled | off | <integer> );
        stale-answer-enable <boolean>;
        stale-answer-ttl <duration>;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index d5e09149e30d8ef5f85e6f4e2d15911208e7a66e..5c50c586f1e1998aa354ae5dee91ee8c994d4f54 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2199,7 +2199,7 @@ static cfg_clausedef_t view_clauses[] = {
        { "rrset-order", &cfg_type_rrsetorder, 0 },
        { "send-cookie", &cfg_type_boolean, 0 },
        { "servfail-ttl", &cfg_type_duration, 0 },
-       { "sortlist", &cfg_type_bracketed_aml, 0 },
+       { "sortlist", &cfg_type_bracketed_aml, CFG_CLAUSEFLAG_DEPRECATED },
        { "stale-answer-enable", &cfg_type_boolean, 0 },
        { "stale-answer-client-timeout", &cfg_type_staleanswerclienttimeout,
          0 },