Permalink
Browse files

remove experimental status from direct-dnskey

  • Loading branch information...
1 parent 5dde2c6 commit e4b36a4f924b0db824dedd9839e6fb229e73dbfa @mind04 mind04 committed with mind04 Dec 17, 2013
Showing with 13 additions and 13 deletions.
  1. +1 −1 pdns/common_startup.cc
  2. +2 −2 pdns/packethandler.cc
  3. +5 −5 pdns/pdns.conf-dist
  4. +3 −3 pdns/pdnssec.cc
  5. +2 −2 pdns/tcpreceiver.cc
@@ -138,7 +138,7 @@ void declareArguments()
::arg().set("lua-prequery-script", "Lua script with prequery handler")="";
::arg().setSwitch("traceback-handler","Enable the traceback handler (Linux only)")="yes";
- ::arg().setSwitch("experimental-direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
+ ::arg().setSwitch("direct-dnskey","Fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
::arg().setSwitch("add-superfluous-nsec3-for-old-bind","Add superfluous NSEC3 record to positive wildcard response")="yes";
::arg().set("default-ksk-algorithms","Default KSK algorithms")="rsasha256";
::arg().set("default-ksk-size","Default KSK size (0 means default)")="0";
@@ -219,7 +219,7 @@ bool PacketHandler::addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd)
haveOne=true;
}
- if(::arg().mustDo("experimental-direct-dnskey")) {
+ if(::arg().mustDo("direct-dnskey")) {
B.lookup(QType(QType::DNSKEY), p->qdomain, p, sd.domain_id);
while(B.get(rr)) {
rr.ttl=sd.default_ttl;
@@ -880,7 +880,7 @@ void PacketHandler::synthesiseRRSIGs(DNSPacket* p, DNSPacket* r)
}
// fix direct DNSKEY ttl
- if(::arg().mustDo("experimental-direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY) {
+ if(::arg().mustDo("direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY) {
rr.ttl = sd.default_ttl;
}
View
@@ -85,6 +85,11 @@
# default-zsk-size=0
#################################
+# direct-dnskey Fetch DNSKEY RRs from backend during DNSKEY synthesis
+#
+# direct-dnskey=no
+
+#################################
# disable-axfr Disable zonetransfers but do allow TCP queries
#
# disable-axfr=no
@@ -120,11 +125,6 @@
# entropy-source=/dev/urandom
#################################
-# experimental-direct-dnskey EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis
-#
-# experimental-direct-dnskey=no
-
-#################################
# experimental-json-interface If the webserver should serve JSON data
#
# experimental-json-interface=no
View
@@ -131,7 +131,7 @@ void loadMainConfig(const std::string& configdir)
::arg().set("max-ent-entries", "Maximum number of empty non-terminals in a zone")="100000";
::arg().set("module-dir","Default directory for modules")=LIBDIR;
- ::arg().setSwitch("experimental-direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
+ ::arg().setSwitch("direct-dnskey","Fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
::arg().laxFile(configname.c_str());
BackendMakers().launch(::arg()["launch"]); // vrooooom!
@@ -472,7 +472,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
if(!presigned && rr.qtype.getCode() == QType::DNSKEY)
{
- if(::arg().mustDo("experimental-direct-dnskey"))
+ if(::arg().mustDo("direct-dnskey"))
{
if(rr.ttl != sd.default_ttl)
{
@@ -769,7 +769,7 @@ bool showZone(DNSSECKeeper& dk, const std::string& zone)
algorithm2name(value.first.d_algorithm, algname);
cout<<"ID = "<<value.second.id<<" ("<<(value.second.keyOrZone ? "KSK" : "ZSK")<<"), tag = "<<value.first.getDNSKEY().getTag();
cout<<", algo = "<<(int)value.first.d_algorithm<<", bits = "<<value.first.getKey()->getBits()<<"\tActive: "<<value.second.active<< " ( " + algname + " ) "<<endl;
- if(value.second.keyOrZone || ::arg().mustDo("experimental-direct-dnskey"))
+ if(value.second.keyOrZone || ::arg().mustDo("direct-dnskey"))
cout<<(value.second.keyOrZone ? "KSK" : "ZSK")<<" DNSKEY = "<<zone<<" IN DNSKEY "<< value.first.getDNSKEY().getZoneRepresentation() << " ; ( " + algname + " )" << endl;
if(value.second.keyOrZone) {
cout<<"DS = "<<zone<<" IN DS "<<makeDSFromDNSKey(zone, value.first.getDNSKEY(), 1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
View
@@ -610,7 +610,7 @@ int TCPNameserver::doAXFR(const string &target, shared_ptr<DNSPacket> q, int out
csp.submit(rr);
}
- if(::arg().mustDo("experimental-direct-dnskey")) {
+ if(::arg().mustDo("direct-dnskey")) {
sd.db->lookup(QType(QType::DNSKEY), target, NULL, sd.domain_id);
while(sd.db->get(rr)) {
rr.ttl = sd.default_ttl;
@@ -658,7 +658,7 @@ int TCPNameserver::doAXFR(const string &target, shared_ptr<DNSPacket> q, int out
// only skip the DNSKEY if direct-dnskey is enabled, to avoid changing behaviour
// when it is not enabled.
- if(::arg().mustDo("experimental-direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY)
+ if(::arg().mustDo("direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY)
continue;
records++;

0 comments on commit e4b36a4

Please sign in to comment.