mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Deprecate fixed value for the rrset-order option

Browse Source 
Mark the "fixed" value for the "rrset-order" option deprecated, so we
can remove it in the future.
This commit is contained in:
Ondřej Surý 2024-03-01 09:34:32 +01:00
parent bf538b63a8
commit 304b5ec1ad
6 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/checkconf/deprecated.conf
View File

@ -30,6 +30,10 @@ options {
dnssec-must-be-secure mustbesecure.example yes; dnssec-must-be-secure mustbesecure.example yes;
sortlist { }; sortlist { };
rrset-order {
name "fixed.example" order fixed;
};
}; };
trusted-keys { trusted-keys {

15
bin/tests/system/checkconf/tests.sh
View File

@ -165,6 +165,12 @@ warnings=$(grep "'notify' is disabled" <checkconf.out$n | wc -l)
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
if grep "^#define DNS_RDATASET_FIXED" "$TOP_BUILDDIR/config.h" >/dev/null 2>&1; then
test_fixed=true
else
test_fixed=false
fi
n=$((n + 1)) n=$((n + 1))
echo_i "checking named-checkconf deprecate warnings ($n)" echo_i "checking named-checkconf deprecate warnings ($n)"
ret=0 ret=0
@ -181,11 +187,16 @@ grep "option 'heartbeat-interval' is deprecated" <checkconf.out$n.1 >/dev/null |
grep "option 'dnssec-must-be-secure' 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 "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 grep "token 'port' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
if $test_fixed; then
grep "rrset-order: order 'fixed' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
else
grep "rrset-order: order 'fixed' was disabled at compilation time" <checkconf.out$n.1 >/dev/null || ret=1
fi
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
# set -i to ignore deprecate warnings # set -i to ignore deprecate warnings
$CHECKCONF -i deprecated.conf >checkconf.out$n.2 2>&1 $CHECKCONF -i deprecated.conf 2>&1 | grep_v "rrset-order: order 'fixed' was disabled at compilation time" >checkconf.out$n.2
grep '.*' <checkconf.out$n.2 >/dev/null && ret=1 grep '^.+$' <checkconf.out$n.2 >/dev/null && ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))

2
bin/tests/system/conf.sh.common
View File

@ -650,3 +650,5 @@ parse_openssl_config() {
esac esac
done < "$OPENSSL_CONF" done < "$OPENSSL_CONF"
} }
grep_v() { grep -v "$@" || test $? = 1; }

4
configure.ac
View File

@ -1203,8 +1203,8 @@ AC_ARG_ENABLE([fixed-rrset],
[enable fixed rrset ordering [default=no]])], [enable fixed rrset ordering [default=no]])],
[], [enable_fixed_rrset="no"]) [], [enable_fixed_rrset="no"])
AS_IF([test "$enable_fixed_rrset" = "yes"], AS_IF([test "$enable_fixed_rrset" = "yes"],
[AC_DEFINE([DNS_RDATASET_FIXED], [1], [AC_MSG_WARN([fixed rrset ordering is deprecated and will be removed in the future release])
[Define to enable "rrset-order fixed" syntax.])]) AC_DEFINE([DNS_RDATASET_FIXED], [1], [Define to enable "rrset-order fixed" syntax.])])
# #
# Activate dnstap? # Activate dnstap?

2
doc/arm/reference.rst
View File

@ -4132,6 +4132,8 @@ RRset Ordering
``fixed`` ``fixed``
Records are returned in the order they are defined in the zone file. Records are returned in the order they are defined in the zone file.
This value is deprecated and will be removed in a future release.
.. note:: .. note::
The ``fixed`` option is only available if BIND is configured with The ``fixed`` option is only available if BIND is configured with

7
lib/isccfg/check.c
View File

@ -168,7 +168,12 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
} }
} else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) { } else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) {
#if !DNS_RDATASET_FIXED #if DNS_RDATASET_FIXED
if ((ent->pctx->flags & CFG_PCTX_NODEPRECATED) == 0) {
cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
"rrset-order: order 'fixed' is deprecated");
}
#else
cfg_obj_log(obj, logctx, ISC_LOG_WARNING, cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
"rrset-order: order 'fixed' was disabled at " "rrset-order: order 'fixed' was disabled at "
"compilation time"); "compilation time");