Merge pull request #2651 from pieterlexis/issue-2648-CDS_CDNSKEY

CDS and CDNSKEY support

diff --cc pdns/dnsrecords.cc
Simple merge

diff --cc pdns/dnsrecords.hh
Simple merge

diff --cc pdns/dnsseckeeper.hh
Simple merge

diff --cc pdns/packethandler.cc
index ee3f06791a267c348143ffedc1b7aa9bf474c772,9a2cc8f023941699fd476bc971b7bfed2a4c2586..50fbcb1998481b5d88d5db206be065703188ff92
--- 1/pdns/packethandler.cc
--- 2/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@@ -951,9 -1043,11 +1044,11 @@@ void PacketHandler::completeANYRecords(
    if(!d_dk.isSecuredZone(sd.qname))
      return;
      
 -  addNSECX(p, r, target, "", sd.qname, 5);
 -  if(pdns_iequals(sd.qname, p->qdomain)) {
 +  addNSECX(p, r, target, DNSName(), sd.qname, 5);
 +  if(sd.qname == p->qdomain) {
      addDNSKEY(p, r, sd);
+     addDNSKEY(p, r, sd, true);
+     addCDS(p, r, sd);
      addNSEC3PARAM(p, r, sd);
    }
  }

diff --cc pdns/pdnssec.cc
Simple merge

diff --cc pdns/tcpreceiver.cc
Simple merge