put experimental- in front of all experimental flags

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2955 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 855b4b51dda135751fff517df0c4684a4a4887c1..75a1d9a66a6f0e10fe697ae7c96d599bb274d2b0 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -53,7 +53,7 @@ void declareArguments()
   ::arg().set("soa-serial-offset","Make sure that no SOA serial is less than this number")="0";
   
   ::arg().set("retrieval-threads", "Number of AXFR-retrieval threads for slave operation")="2";
-  ::arg().setSwitch("json-interface", "If the webserver should serve JSON data")="no";
+  ::arg().setSwitch("experimental-json-interface", "If the webserver should serve JSON data")="no";
 
   ::arg().setCmd("help","Provide a helpful message");
   ::arg().setCmd("version","Output version and compilation date");
@@ -127,7 +127,7 @@ void declareArguments()
   ::arg().set("max-tcp-connections","Maximum number of TCP connections")="10";
   ::arg().setSwitch("no-shuffle","Set this to prevent random shuffling of answers - for regression testing")="off";
 
-  ::arg().set("logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log";
+  ::arg().set("experimental-logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log";
   ::arg().set("setuid","If set, change user id to this uid for more security")="";
   ::arg().set("setgid","If set, change group id to this gid for more security")="";
 
@@ -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("direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
+  ::arg().setSwitch("experimental-direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
 }
 
 void declareStats(void)

diff --git a/pdns/json_ws.cc b/pdns/json_ws.cc
index 5210cab6bf23d5227e300cbb5287a865d5438ee1..ae8c2cc93fd8dc06056f407f1c506993ce1785a0 100644 (file)
--- a/pdns/json_ws.cc
+++ b/pdns/json_ws.cc
@@ -129,7 +129,7 @@ void JWebserver::readRequest(int fd)
     content += returnJSONObject(stats);  
   }
   else if(varmap["command"]=="log-grep") {
-    content += makeLogGrepJSON(varmap, ::arg()["logfile"], " pdns_recursor[");
+    content += makeLogGrepJSON(varmap, ::arg()["experimental-logfile"], " pdns_recursor[");
   }
   else { //  if(varmap["command"] == "stats") {
     stats = getAllStatsMap();

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 80c632d6632da34f270c549288d090a48c55b9a0..59250b8d1a340fe4107875ec52f7fb0d89432d52 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -222,7 +222,7 @@ bool PacketHandler::addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd)
     haveOne=true;
   }
 
-  if(::arg().mustDo("direct-dnskey")) {
+  if(::arg().mustDo("experimental-direct-dnskey")) {
     B.lookup(QType(QType::DNSKEY), p->qdomain, p, sd.domain_id);
     while(B.get(rr)) {
       rr.ttl=sd.default_ttl;
@@ -864,7 +864,7 @@ void PacketHandler::synthesiseRRSIGs(DNSPacket* p, DNSPacket* r)
     }
     
     // fix direct DNSKEY ttl
-    if(::arg().mustDo("direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY) {
+    if(::arg().mustDo("experimental-direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY) {
       rr.ttl = sd.default_ttl;
     }
 

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 45845e03000761b6940fb6ddcfcb437b28e53abe..7bd705097f91bdfb1307542af431201c9e3c337c 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -49,11 +49,6 @@
 #
 # default-ttl=3600
 
-#################################
-# direct-dnskey        EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis
-#
-# direct-dnskey=no
-
 #################################
 # disable-axfr Disable zonetransfers but do allow TCP queries
 #
@@ -89,6 +84,21 @@
 #
 # 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
+
+#################################
+# experimental-logfile Filename of the log file for JSON parser
+#
+# experimental-logfile=/var/log/pdns.log
+
 #################################
 # fancy-records        Process URL and MBOXFW records
 #
@@ -99,11 +109,6 @@
 #
 # guardian=no
 
-#################################
-# json-interface       If the webserver should serve JSON data
-#
-# json-interface=no
-
 #################################
 # launch       Which backends to launch and order to query them in
 #
@@ -149,11 +154,6 @@
 #
 # log-failed-updates=
 
-#################################
-# logfile      Filename of the log file for JSON parser
-#
-# logfile=/var/log/pdns.log
-
 #################################
 # logging-facility     Log under a specific facility
 #

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 479f80f80002452a2e26aa1236e1b95be437ce34..a9020d231edbbadf8d1e8464590e8c7dcbcf0795 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1833,7 +1833,7 @@ try
 
   t_fdm=getMultiplexer();
   if(!t_id) {
-    if(::arg().mustDo("json-interface")) {
+    if(::arg().mustDo("experimental-json-interface")) {
       L<<Logger::Warning << "Enabling JSON interface" << endl;
       new JWebserver(t_fdm);
     }
@@ -1974,8 +1974,8 @@ int main(int argc, char **argv)
     ::arg().setSwitch( "use-ntlog", "Use the NT logging facilities" )= "yes"; 
     ::arg().setSwitch( "use-logfile", "Use a log file" )= "no"; 
 #else
-    ::arg().set( "logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log"; 
-    ::arg().setSwitch( "json-interface", "If we should run a JSON webserver") = "no";
+    ::arg().set( "experimental-logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log"; 
+    ::arg().setSwitch( "experimental-json-interface", "If we should run a JSON webserver") = "no";
     ::arg().set("quiet","Suppress logging of questions and answers")="";
     ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
 #endif

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index f2dbc56c47dce303c62aecc276619e5b36480ff0..68ee9b9c4143837504b53500a6a46c4a80bd62cb 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -68,7 +68,7 @@ void loadMainConfig(const std::string& configdir)
   ::arg().laxFile(configname.c_str());
   ::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("direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
+  ::arg().setSwitch("experimental-direct-dnskey","EXPERIMENTAL: fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
 
   BackendMakers().launch(::arg()["launch"]); // vrooooom!
   ::arg().laxFile(configname.c_str());    
@@ -308,7 +308,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
     {
       if(!dk.isPresigned(zone))
       {
-        if(::arg().mustDo("direct-dnskey"))
+        if(::arg().mustDo("experimental-direct-dnskey"))
         {
           if(rr.ttl != sd.default_ttl)
           {

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 68f50fcbff40bcde15d02c1ba9c81597da459a1c..83452d7714d5d4eec7697fed59eb008eec294339 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -607,7 +607,7 @@ int TCPNameserver::doAXFR(const string &target, shared_ptr<DNSPacket> q, int out
     csp.submit(rr);
   }
   
-  if(::arg().mustDo("direct-dnskey")) {
+  if(::arg().mustDo("experimental-direct-dnskey")) {
     sd.db->lookup(QType(QType::DNSKEY), target, NULL, sd.domain_id);
     while(sd.db->get(rr)) {
       rr.ttl = sd.default_ttl;
@@ -647,7 +647,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("direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY)
+    if(::arg().mustDo("experimental-direct-dnskey") && rr.qtype.getCode() == QType::DNSKEY)
       continue;
 
     records++;

diff --git a/pdns/ws.cc b/pdns/ws.cc
index 181d95c90d79e8b015bb5e8949e444f467060994..f8261282ba3903079b9ee443af81eb294b42be4e 100644 (file)
--- a/pdns/ws.cc
+++ b/pdns/ws.cc
@@ -443,7 +443,7 @@ string StatWebServer::jsonstat(const string& method, const string& post, const m
     }  
   }
   if(command=="log-grep") {
-    ret += makeLogGrepJSON(ourvarmap, ::arg()["logfile"], " pdns[");
+    ret += makeLogGrepJSON(ourvarmap, ::arg()["experimental-logfile"], " pdns[");
   }
  
   const char *kinds[]={"Master", "Slave", "Native"};
@@ -479,7 +479,7 @@ void StatWebServer::launch()
   try {
     d_ws->setCaller(this);
     d_ws->registerHandler("",&indexfunction);
-    if(::arg().mustDo("json-interface"))
+    if(::arg().mustDo("experimental-json-interface"))
       d_ws->registerHandler("jsonstat", &jsonstat);
     d_ws->go();
   }