From: Bert Hubert Date: Sat, 19 Jun 2010 13:19:18 +0000 (+0000) Subject: make sure NSEC for zone apex covers the DNSKEY too X-Git-Tag: rec-3.3~55 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b30cd1a9b16333cd01433fcc6983fbe26000ead;p=pdns make sure NSEC for zone apex covers the DNSKEY too git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1647 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc index 15792f55e..81f6fca9a 100644 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@ -463,12 +463,14 @@ int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r) } -void PacketHandler::emitNSEC(const std::string& begin, const std::string& end, const std::string& toNSEC, DNSPacket *r, int mode) +void PacketHandler::emitNSEC(const std::string& begin, const std::string& end, const std::string& toNSEC, const std::string& auth, DNSPacket *r, int mode) { cerr<<"We should emit '"<getBeforeAndAfterNames(sd.domain_id, auth, auth, before, after); - emitNSEC(auth, after, auth, r, mode); + emitNSEC(auth, after, auth, auth, r, mode); } if(mode == 3) - emitNSEC(before, after, target, r, mode); + emitNSEC(before, after, target, auth, r, mode); return; } diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh index aa83882ba..ff3824c92 100644 --- a/pdns/packethandler.hh +++ b/pdns/packethandler.hh @@ -99,7 +99,7 @@ private: void addNSECX(DNSPacket *p, DNSPacket* r, const string &target, const std::string& auth, int mode); void addNSEC(DNSPacket *p, DNSPacket* r, const string &target, const std::string& auth, int mode); void addNSEC3(DNSPacket *p, DNSPacket* r, const string &target, const std::string& auth, const NSEC3PARAMRecordContent& nsec3param, int mode); - void emitNSEC(const std::string& before, const std::string& after, const std::string& toNSEC, DNSPacket *r, int mode); + void emitNSEC(const std::string& before, const std::string& after, const std::string& toNSEC, const std::string& auth, DNSPacket *r, int mode); void emitNSEC3(const NSEC3PARAMRecordContent &ns3rc, const std::string& auth, const std::string& unhashed, const std::string& begin, const std::string& end, const std::string& toNSEC3, DNSPacket *r, int mode); void synthesiseRRSIGs(DNSPacket* p, DNSPacket* r);