]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
No longer filter DNSSEC metadata when DNSSEC is enabled in gsql 7921/head
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 10 Apr 2019 16:59:23 +0000 (18:59 +0200)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Wed, 12 Jun 2019 18:00:27 +0000 (20:00 +0200)
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)

pdns/backends/gsql/gsqlbackend.cc

index c2df712b5ea83648081cabbeac5a3d4d76f369d9..ccd4e0e50e89fc8dfa1787aedc3945db2b0be4e0 100644 (file)
@@ -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]);
     }