From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 10 Apr 2019 16:59:23 +0000 (+0200)
Subject: No longer filter DNSSEC metadata when DNSSEC is enabled in gsql
X-Git-Tag: auth-4.1.9~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7921%2Fhead;p=thirdparty%2Fpdns.git

No longer filter DNSSEC metadata when DNSSEC is enabled in gsql

As noted in #7705, gsql getAllDomainMetadata() did not return all domain
metadata.  This function would always filter DNSSEC related metadata, even
if a backend was configured to support DNSSEC.

(cherry picked from commit d97e1ae1430a1e66893e8156bdf1c7232d3d0331)
---

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index c2df712b5e..ccd4e0e50e 100644
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -958,7 +958,7 @@ bool GSQLBackend::getAllDomainMetadata(const DNSName& name, std::map<std::string
       d_GetAllDomainMetadataQuery_stmt->nextRow(row);
       ASSERT_ROW_COLUMNS("get-all-domain-metadata-query", row, 2);
 
-      if (!isDnssecDomainMetadata(row[0]))
+      if (d_dnssecQueries || !isDnssecDomainMetadata(row[0]))
         meta[row[0]].push_back(row[1]);
     }