Also mark dname-processing as stable

diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index ea40a20cfe72080fff60f9b66bfcf823d575ba53..fdf5d18a3df9ad8c3bdf763bfd77d0c6d224291f 100644 (file)
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -243,6 +243,13 @@ Do not listen to TCP queries. Breaks RFC compliance.
 Number of Distributor (backend) threads to start per receiver thread. See
 ["Authoritative Server Performance"](performance.md).
 
+## `dname-processing`
+* Boolean
+* Default: no
+
+Synthesise CNAME records from DNAME records as required. This approximately
+doubles query load. **Do not combine with DNSSEC!**
+
 ## `dnsupdate`
 * Boolean
 * Default: no
@@ -275,13 +282,6 @@ Enables EDNS subnet processing, for backends that support it.
 
 Entropy source file to use.
 
-## `experimental-dname-processing`
-* Boolean
-* Default: no
-
-Synthesise CNAME records from DNAME records as required. This approximately
-doubles query load. **Do not combine with DNSSEC!**
-
 ## `json-interface`
 * Boolean
 * Default: no

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 529940cf41e8f7ee90d4a14c51df556fc4909e2f..9501b7fdec8a221e2e21bbf263b56dda3032e23f 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -75,7 +75,7 @@ void declareArguments()
   ::arg().setSwitch("api-readonly", "If the JSON API should disallow data modification")="no";
   ::arg().set("api-key", "REST API Static authentication key (required for API use)")="";
   ::arg().set("api-logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log";
-  ::arg().setSwitch("experimental-dname-processing", "If we should support DNAME records")="no";
+  ::arg().setSwitch("dname-processing", "If we should support DNAME records")="no";
 
   ::arg().setCmd("help","Provide a helpful message");
   ::arg().setCmd("version","Output version and compilation date");

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index f6b3656a915f345ff365cc067781f65fa7805c3d..56e1375032010fd7dbb2c7591b01f3b9b17f62fe 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -64,7 +64,7 @@ enum root_referral {
 PacketHandler::PacketHandler():B(s_programname), d_dk(&B)
 {
   ++s_count;
-  d_doDNAME=::arg().mustDo("experimental-dname-processing");
+  d_doDNAME=::arg().mustDo("dname-processing");
   d_doRecursion= ::arg().mustDo("recursor");
   d_logDNSDetails= ::arg().mustDo("log-dns-details");
   d_doIPv6AdditionalProcessing = ::arg().mustDo("do-ipv6-additional-processing");

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index ae9fe7da81372707415e14b2cf4658cad7284d51..e457eb0fc0ba9068c600543510d15a1abbea266d 100644 (file)
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -10,7 +10,7 @@ __EOF__
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
                        --config-name=bind --socket-dir=./ --no-shuffle \
                        --send-root-referral \
-                       --cache-ttl=$cachettl --experimental-dname-processing \
+                       --cache-ttl=$cachettl --dname-processing \
                        --disable-axfr-rectify=yes &
                skipreasons="nodnssec nodyndns nometa"
                bindwait bind
@@ -91,7 +91,7 @@ __EOF__
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
                        --config-name=bind --socket-dir=./ --no-shuffle \
                        --send-root-referral \
-                       --cache-ttl=$cachettl --experimental-dname-processing \
+                       --cache-ttl=$cachettl --dname-processing \
                        --disable-axfr-rectify=yes $lua_prequery &
 
                bindwait bind

diff --git a/regression-tests/backends/bind-slave b/regression-tests/backends/bind-slave
index bb9249badadf24a4689146d94a8c9a596c9f602c..3805274f9d18b5bb779d2d09d8ce1fe9bdaccb4c 100644 (file)
--- a/regression-tests/backends/bind-slave
+++ b/regression-tests/backends/bind-slave
@@ -30,7 +30,7 @@
                --no-shuffle --launch=bind --bind-config=./named-slave.conf --slave \
                --send-root-referral --retrieval-threads=1  --config-name=bind-slave \
                --dnsupdate=yes \
-               --cache-ttl=$cachettl --no-config --experimental-dname-processing --bind-dnssec-db=./dnssec-slave.sqlite3 \
+               --cache-ttl=$cachettl --no-config --dname-processing --bind-dnssec-db=./dnssec-slave.sqlite3 \
                --module-dir=./modules &
        echo 'waiting for zones to be loaded'
        bindwait bind-slave

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index ad90d8367232ea03d45a7f9ac0cab5caa05decc8..8a3039b35333c49d51df9e056eee10c74cc497d9 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -77,7 +77,7 @@ EOF
 
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=geoip \
-                       --cache-ttl=$cachettl --experimental-dname-processing --no-config \
+                       --cache-ttl=$cachettl --dname-processing --no-config \
                        --distributor-threads=1 \
                         --geoip-zones-file=$testsdir/geo.yaml --geoip-database-files=/usr/share/GeoIP/GeoIP.dat \
                         --module-dir=./modules --edns-subnet-processing=yes \

diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave
index 868360f5502048c3bcf34a0c8ea87fa67835fe0f..3cd8988b6e57ba134a199ed990e6b387d62b77a5 100644 (file)
--- a/regression-tests/backends/gmysql-slave
+++ b/regression-tests/backends/gmysql-slave
@@ -43,7 +43,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=gmysql2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
 
        echo 'waiting for zones to be slaved'
        loopcount=0

diff --git a/regression-tests/backends/godbc_mssql-slave b/regression-tests/backends/godbc_mssql-slave
index d32d0f5811ff74d7510b37b87cf46709bc3f4897..02fde6be529a7fe514884bdf743ca24490117bd0 100644 (file)
--- a/regression-tests/backends/godbc_mssql-slave
+++ b/regression-tests/backends/godbc_mssql-slave
@@ -30,7 +30,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=godbc2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
 
        echo 'waiting for zones to be slaved'
        set +e

diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave
index 9e130e37b4dbc5e9f9f05dcb5379c09516ed2fae..988325f1ab2eb192dd62ef4111a11c8a54996e42 100644 (file)
--- a/regression-tests/backends/goracle-slave
+++ b/regression-tests/backends/goracle-slave
@@ -42,7 +42,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=goracle2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
 
        echo 'waiting for zones to be slaved'
        loopcount=0

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index 94fdc612694bc1bacdf5f759dd5722d9fd88cb1b..edb35451a02203a4b54128ac5a6633eee73a771f 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -37,7 +37,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=gpgsql2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
 
        echo 'waiting for zones to be slaved'
        loopcount=0

diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 837188236d47df7ea2f8d79b90d58a41122b586a..c7b2dc0f9abcad6e94af4f3f42aff259fb0b828a 100644 (file)
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -37,7 +37,7 @@ gsql_master()
                --config-name=$backend --socket-dir=./ --no-shuffle \
                --send-root-referral \
                --dnsupdate=yes \
-               --cache-ttl=$cachettl --experimental-dname-processing \
+               --cache-ttl=$cachettl --dname-processing \
                --disable-axfr-rectify=yes $lua_prequery &
 
        if [ $context = ${backend}-nsec3 ]

diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index 79d7fe167487092da19ff1ec34922e19c4fe7b92..8736bb267a9bdf727f43e21ec07fc7237faa94e8 100644 (file)
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -31,7 +31,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=gsqlite32 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
 
        echo 'waiting for zones to be slaved'
        set +e

diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master
index 51d1b3f99ba2bc4d75e519d87d222218bd604cbd..bf06de64e68af02bf5c577890e6a15d37fe5e8a2 100644 (file)
--- a/regression-tests/backends/mydns-master
+++ b/regression-tests/backends/mydns-master
@@ -25,7 +25,7 @@ __EOF__
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                        --config-dir=. --config-name=mydns \
                        --no-shuffle --master --send-root-referral \
-                       --cache-ttl=0 --experimental-dname-processing \
+                       --cache-ttl=0 --dname-processing \
                        --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no &
                skipreasons="nodnssec noent nodyndns nometa noaxfr"
                ;;

diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master
index 4582b61b0f1f03e2a2ffb20484191345e4c28d29..2b815fa3d5b7c1f51b7cba78c2b7cb3c63e610f7 100644 (file)
--- a/regression-tests/backends/opendbx-master
+++ b/regression-tests/backends/opendbx-master
@@ -10,7 +10,7 @@ case $context in
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
                        --no-shuffle --launch=opendbx \
                        --send-root-referral \
-                       --cache-ttl=$cachettl --experimental-dname-processing --no-config \
+                       --cache-ttl=$cachettl --dname-processing --no-config \
                        --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \
                        --opendbx-database=pdns-opendbx.sqlite3 --module-dir=./modules &
                skipreasons="nodnssec noent nodyndns nometa"

diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master
index 2f29bf2522fe3219df256a5ca098dc0681013fdd..a105d3676aacb7d9f6e4b90fddb2876539410e0e 100644 (file)
--- a/regression-tests/backends/oracle-master
+++ b/regression-tests/backends/oracle-master
@@ -49,7 +49,7 @@ __EOF__
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
                        --config-name=oracle --socket-dir=./ --no-shuffle \
                        --send-root-referral --query-logging \
-                       --cache-ttl=$cachettl --experimental-dname-processing $lua_prequery &
+                       --cache-ttl=$cachettl --dname-processing $lua_prequery &
 
                if [ $context = oracle-nsec3 ]
                then

diff --git a/regression-tests/backends/oracle-slave b/regression-tests/backends/oracle-slave
index e75027eee6397edc06471a1729ebf8ec3edc5a4e..5a30a4c497af39ed3964fe5f1a5fc8795333db02 100644 (file)
--- a/regression-tests/backends/oracle-slave
+++ b/regression-tests/backends/oracle-slave
@@ -42,7 +42,7 @@ __EOF__
        $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
                --config-name=oracle2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
-               --slave-cycle-interval=300 --experimental-dname-processing &
+               --slave-cycle-interval=300 --dname-processing &
        echo 'waiting for zones to be slaved'
 
        loopcount=0

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 449677734c508ce680288d4c7df58573fbe4c9d2..5ddcf33d2abcdaee0ab6da74e8586467e308a9ee 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -111,7 +111,7 @@ EOF
 
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=remote \
-                       --cache-ttl=$cachettl --experimental-dname-processing --no-config \
+                       --cache-ttl=$cachettl --dname-processing --no-config \
                        --send-root-referral --distributor-threads=1 \
                        --dnsupdate=yes \
                        --remote-connection-string="$connstr" $remote_add_param --module-dir=./modules &

diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index 3000361b88dddec3d2c0e0cf1c9b271f9efadbc5..aac588d650185360835e8540d73b95522a1d8a9c 100644 (file)
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -2,7 +2,7 @@ case $context in
        tinydns)
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=tinydns \
-                --cache-ttl=$cachettl --experimental-dname-processing --no-config \
+                --cache-ttl=$cachettl --dname-processing --no-config \
                        --send-root-referral \
                        --dnsupdate=yes \
                        --tinydns-dbfile=../modules/tinydnsbackend/data.cdb --module-dir=./modules &