File pdns-3.2-allow-axfr-from.patch of Package powerdns

File pdns-3.2-allow-axfr-from.patch of Package powerdns (Revision 71)

Currently displaying revision 71, show latest

--- pdns/backends/gsql/gsqlbackend.cc	2013-04-23 10:52:06.495487248 +0200
+++ pdns/backends/gsql/gsqlbackend.cc	2013-04-23 10:58:18.797423413 +0200
@@ -284,6 +284,9 @@
   d_removeEmptyNonTerminalsFromZoneQuery = getArg("remove-empty-non-terminals-from-zone-query");
   d_insertEmptyNonTerminalQuery = getArg("insert-empty-non-terminal-query"+authswitch);
   d_deleteEmptyNonTerminalQuery = getArg("delete-empty-non-terminal-query");
+
+  // Define domainmetadata queries independent from dnssec functionality
+  d_GetDomainMetadataQuery = getArg("get-domain-metadata-query");
   
   if (d_dnssecQueries)
   {
@@ -299,7 +302,8 @@
     d_AddDomainKeyQuery = getArg("add-domain-key-query");
     d_ListDomainKeysQuery = getArg("list-domain-keys-query");
     
-    d_GetDomainMetadataQuery = getArg("get-domain-metadata-query");
+    // Already defined outside of dnssec functionality
+    // d_GetDomainMetadataQuery = getArg("get-domain-metadata-query");
     d_ClearDomainMetadataQuery = getArg("clear-domain-metadata-query");
     d_SetDomainMetadataQuery = getArg("set-domain-metadata-query");
     
@@ -637,7 +641,7 @@
 
 bool GSQLBackend::getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta)
 {
-  if(!d_dnssecQueries)
-    return false;
+//  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());