From: Pieter Lexis Date: Thu, 2 May 2019 11:41:34 +0000 (+0200) Subject: Merge pull request #7523 from mind04/non-dnssec X-Git-Tag: rec-4.2.0-rc1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5510ebdcdc8afd25cb0f45c129f41b2f79600e9a;p=thirdparty%2Fpdns.git Merge pull request #7523 from mind04/non-dnssec disable dnssec pre-processing for non dnssec zones and avoid a lot of isSecuredZone() calls --- 5510ebdcdc8afd25cb0f45c129f41b2f79600e9a diff --cc pdns/packethandler.cc index 934c32e084,944583606d..f626ff95f8 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@@ -1000,10 -996,11 +996,11 @@@ void PacketHandler::makeNOError(DNSPack rr.auth = 1; r->addRecord(rr); - if(d_dk.isSecuredZone(sd.qname)) + if(d_dnssec) { addNSECX(p, r, target, wildcard, sd.qname, mode); + } - S.ringAccount("noerror-queries",p->qdomain.toLogString()+"/"+p->qtype.getName()); + S.ringAccount("noerror-queries", p->qdomain, p->qtype); }