From 19dea210af2b81a2b16f36a539446757ecf20290 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 13 May 2013 22:10:28 +0200
Subject: [PATCH] add experimental direct dnskey support to rfc2136

---
 pdns/rfc2136handler.cc           | 2 +-
 regression-tests/start-test-stop | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index 160b93cfc5..11e2b50f56 100644
--- 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 b98c16c0ae..0774a3f078 100755
--- 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" \
-- 
2.47.3