add experimental direct dnskey support to rfc2136

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index 160b93cfc57fcb7b29ebc87f351188816189df9e..11e2b50f569cc499b8f6fa33c3d6df29631492d1 100644 (file)
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -96,7 +96,7 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *
     return 0;    
   }
 
-  if (!isPresigned && (rrType == QType::RRSIG || rrType == QType::DNSKEY) ) {
+  if (!isPresigned && ((!::arg().mustDo("experimental-direct-dnskey") && rrType == QType::DNSKEY) || rrType == QType::RRSIG)) {
     L<<Logger::Warning<<msgPrefix<<"Trying to add/update/delete "<<rrLabel<<"|"<<rrType.getName()<<" in non-presigned zone, ignoring!"<<endl;
     return 0;
   }

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index b98c16c0ae3c899c13e309bd295621769142b8f8..0774a3f0789dfe5c4ca80de5ffe75216e9cf229d 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -165,7 +165,7 @@ case $context in
                                --no-shuffle --launch=bind --bind-config=./named.conf \
                                --bind-dnssec-db=./dnssec.sqlite3 \
                                --send-root-referral \
-                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
+                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
                                --cache-ttl=$cachettl --no-config &
                        bindwait
                        ;;
@@ -201,7 +201,7 @@ __EOF__
                        $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
                                --no-shuffle --launch=gmysql \
                                --master --send-root-referral \
-                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
+                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
                                --cache-ttl=$cachettl --no-config \
                                --gmysql-dbname="$GMYSQLDB" \
                                --gmysql-user="$GMYSQLUSER" \
@@ -287,7 +287,7 @@ __EOF__
                        $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
                                --no-shuffle --launch=random,gmysql --gmysql-dnssec \
                                --send-root-referral \
-                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
+                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
                                --cache-ttl=$cachettl --no-config \
                                --gmysql-dbname="$GMYSQLDB" \
                                --gmysql-user="$GMYSQLUSER" \