Changeset 1804

Timestamp:

01/04/11 16:09:51 (2 years ago)

Author:

ahu

Message:

PAY ATTENTION! from this commit onwards, generic backends will NOT perform dnssec queries by default, you'll have to turn this on with: 'gmysql-dnssec' or 'gpgsql-dnssec' etc

Location:

trunk/pdns

Files:

• modules/gmysqlbackend/gmysqlbackend.cc (modified) (1 diff)
• modules/gpgsqlbackend/gpgsqlbackend.cc (modified) (1 diff)
• modules/gsqlite3backend/gsqlite3backend.cc (modified) (1 diff)
• pdns/backends/gsql/gsqlbackend.cc (modified) (10 diffs)

trunk/pdns/modules/gmysqlbackend/gmysqlbackend.cc

@@ -51 +51 @@
     declare(suffix,"socket","Pdns backend socket to connect to","");
     declare(suffix,"password","Pdns backend password to connect with","");
-    declare(suffix,"dnssec","Assume DNSSEC Schema is in place","false");
+    declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no");
 
     declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'");

trunk/pdns/modules/gpgsqlbackend/gpgsqlbackend.cc

@@ -51 +51 @@
     declare(suffix,"socket","Pdns backend socket to connect to","");
     declare(suffix,"password","Pdns backend password to connect with","");
-
+    declare(suffix, "dnssec", "Assume DNSSEC Schema is in place","no");
     declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'");
     declare(suffix,"id-query","Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s' and domain_id=%d");

trunk/pdns/modules/gsqlite3backend/gsqlite3backend.cc

@@ -96 +96 @@
     declare( suffix, "delete-zone-query", "", "delete from records where domain_id=%d");
     declare( suffix, "check-acl-query","", "select value from acls where acl_type='%s' and acl_key='%s'");
-    declare(suffix, "dnssec", "Assume DNSSEC Schema is in place","false");
+    declare(suffix, "dnssec", "Assume DNSSEC Schema is in place","no");
 
     declare(suffix,"add-domain-key-query","", "insert into cryptokeys (domain_id, flags, active, content) select id, %d, %d, '%s' from domains where name='%s'");

trunk/pdns/pdns/backends/gsql/gsqlbackend.cc

@@ -259 +259 @@
 bool GSQLBackend::updateDNSSECOrderAndAuth(uint32_t domain_id, const std::string& zonename, const std::string& qname, bool auth)
 {
+  if(!d_dnssecQueries)
+    return false;
   string ins=toLower(labelReverse(makeRelative(qname, zonename)));
   return this->updateDNSSECOrderAndAuthAbsolute(domain_id, qname, ins, auth);
@@ -265 +267 @@
 bool GSQLBackend::updateDNSSECOrderAndAuthAbsolute(uint32_t domain_id, const std::string& qname, const std::string& ordername, bool auth)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];
   // ordername='%s',auth=%d where name='%s' and domain_id='%d'
@@ -276 +280 @@
 bool GSQLBackend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::string& qname, std::string& unhashed, std::string& before, std::string& after)
 {
+  if(!d_dnssecQueries)
+    return false;
   cerr<<"gsql before/after called for id="<<id<<", qname='"<<qname<<"'"<<endl;
   unhashed.clear(); before.clear(); after.clear();
@@ -319 +325 @@
 int GSQLBackend::addDomainKey(const string& name, const KeyData& key)
 {
+  if(!d_dnssecQueries)
+    return -1;
   char output[16384];  
   snprintf(output,sizeof(output)-1,d_AddDomainKeyQuery.c_str(),
@@ -334 +342 @@
 bool GSQLBackend::activateDomainKey(const string& name, unsigned int id)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];
   snprintf(output,sizeof(output)-1,d_ActivateDomainKeyQuery.c_str(), sqlEscape(toLower(name)).c_str(), id);
@@ -348 +358 @@
 bool GSQLBackend::deactivateDomainKey(const string& name, unsigned int id)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];
   snprintf(output,sizeof(output)-1,d_DeactivateDomainKeyQuery.c_str(), sqlEscape(toLower(name)).c_str(), id);
@@ -362 +374 @@
 bool GSQLBackend::removeDomainKey(const string& name, unsigned int id)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];
   snprintf(output,sizeof(output)-1,d_RemoveDomainKeyQuery.c_str(), sqlEscape(toLower(name)).c_str(), id);
@@ -378 +392 @@
 bool GSQLBackend::getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];  
   snprintf(output,sizeof(output)-1,d_ListDomainKeysQuery.c_str(), sqlEscape(toLower(name)).c_str());
@@ -407 +423 @@
 bool GSQLBackend::getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta)
 {
+  if(!d_dnssecQueries)
+    return false;
   char output[1024];  
   snprintf(output,sizeof(output)-1,d_GetDomainMetadataQuery.c_str(), sqlEscape(name).c_str(), sqlEscape(kind).c_str());
@@ -429 +447 @@
 {
   char output[16384];  
+  if(!d_dnssecQueries)
+    return false;
 
   if(!meta.empty())