From 4dfe94ae1bc19b074493eb0d5cffd247c2e20b35 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 1 Dec 2015 12:39:15 +0100 Subject: [PATCH] Also mark dname-processing as stable --- docs/markdown/authoritative/settings.md | 14 +++++++------- pdns/common_startup.cc | 2 +- pdns/packethandler.cc | 2 +- regression-tests/backends/bind-master | 4 ++-- regression-tests/backends/bind-slave | 2 +- regression-tests/backends/geoip-master | 2 +- regression-tests/backends/gmysql-slave | 2 +- regression-tests/backends/godbc_mssql-slave | 2 +- regression-tests/backends/goracle-slave | 2 +- regression-tests/backends/gpgsql-slave | 2 +- regression-tests/backends/gsql-common | 2 +- regression-tests/backends/gsqlite3-slave | 2 +- regression-tests/backends/mydns-master | 2 +- regression-tests/backends/opendbx-master | 2 +- regression-tests/backends/oracle-master | 2 +- regression-tests/backends/oracle-slave | 2 +- regression-tests/backends/remote-master | 2 +- regression-tests/backends/tinydns-master | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md index ea40a20cf..fdf5d18a3 100644 --- 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 529940cf4..9501b7fde 100644 --- 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 f6b3656a9..56e137503 100644 --- 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 ae9fe7da8..e457eb0fc 100644 --- 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 bb9249bad..3805274f9 100644 --- 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 ad90d8367..8a3039b35 100644 --- 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 868360f55..3cd8988b6 100644 --- 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 d32d0f581..02fde6be5 100644 --- 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 9e130e37b..988325f1a 100644 --- 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 94fdc6126..edb35451a 100644 --- 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 837188236..c7b2dc0f9 100644 --- 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 79d7fe167..8736bb267 100644 --- 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 51d1b3f99..bf06de64e 100644 --- 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 4582b61b0..2b815fa3d 100644 --- 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 2f29bf252..a105d3676 100644 --- 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 e75027eee..5a30a4c49 100644 --- 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 449677734..5ddcf33d2 100644 --- 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 3000361b8..aac588d65 100644 --- 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 & -- 2.40.0