set default ksk instead of zsk algorithm

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 26f06242728a5b898acc0085f84833022d7f8154..f6bb4606960820899c615bd253e43f532fc4d508 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -170,9 +170,9 @@ void declareArguments()
 
   ::arg().setSwitch("traceback-handler","Enable the traceback handler (Linux only)")="yes";
   ::arg().setSwitch("direct-dnskey","Fetch DNSKEY RRs from backend during DNSKEY synthesis")="no";
-  ::arg().set("default-ksk-algorithms","Default KSK algorithms")="";
+  ::arg().set("default-ksk-algorithms","Default KSK algorithms")="ecdsa256";
   ::arg().set("default-ksk-size","Default KSK size (0 means default)")="0";
-  ::arg().set("default-zsk-algorithms","Default ZSK algorithms")="ecdsa256";
+  ::arg().set("default-zsk-algorithms","Default ZSK algorithms")="";
   ::arg().set("default-zsk-size","Default ZSK size (0 means default)")="0";
   ::arg().set("max-nsec3-iterations","Limit the number of NSEC3 hash iterations")="500"; // RFC5155 10.3
 

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 7f977ab2ffeba0bb37a5307787c7869c8322d808..888396f92c42b9357ec0b126639e1fb8c75b210f 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -107,7 +107,7 @@
 #################################
 # default-ksk-algorithms       Default KSK algorithms
 #
-# default-ksk-algorithms=
+# default-ksk-algorithms=ecdsa256
 
 #################################
 # default-ksk-size     Default KSK size (0 means default)
@@ -142,7 +142,7 @@
 #################################
 # default-zsk-algorithms       Default ZSK algorithms
 #
-# default-zsk-algorithms=ecdsa256
+# default-zsk-algorithms=
 
 #################################
 # default-zsk-size     Default ZSK size (0 means default)

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index ebd16ed2059b8f7bf0887ef8b62b56c2bbaff81e..710da1b6cd850887c19f245e6c18cc6658eb3c1f 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -77,9 +77,9 @@ void loadMainConfig(const std::string& configdir)
   string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
   cleanSlashes(configname);
 
-  ::arg().set("default-ksk-algorithms","Default KSK algorithms")="";
+  ::arg().set("default-ksk-algorithms","Default KSK algorithms")="ecdsa256";
   ::arg().set("default-ksk-size","Default KSK size (0 means default)")="0";
-  ::arg().set("default-zsk-algorithms","Default ZSK algorithms")="ecdsa256";
+  ::arg().set("default-zsk-algorithms","Default ZSK algorithms")="";
   ::arg().set("default-zsk-size","Default ZSK size (0 means default)")="0";
   ::arg().set("default-soa-edit","Default SOA-EDIT value")="";
   ::arg().set("default-soa-edit-signed","Default SOA-EDIT value for signed zones")="";