reinstate apex NSEC as it is required in some cases

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2446 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 6afacac6da8c9843abbcacc6f212065b0362a548..c57fa2487e820f9076294071853ad705e59b8046 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -671,8 +671,9 @@ void PacketHandler::addNSEC(DNSPacket *p, DNSPacket *r, const string& target, co
   if(mode == 1)  {
     emitNSEC(before, after, target, sd, r, mode);
 
-    // sd.db->getBeforeAndAfterNames(sd.domain_id, auth, auth, before, after); 
-    // emitNSEC(auth, after, auth, sd, r, mode);
+    // this one does wildcard denial, if applicable
+    sd.db->getBeforeAndAfterNames(sd.domain_id, auth, auth, before, after); 
+    emitNSEC(auth, after, auth, sd, r, mode);
   }
 
   if(mode == 3)

diff --git a/regression-tests/nsec-middle/expected_result b/regression-tests/nsec-middle/expected_result
index 16830070aa61d56228683768f634e7d03afb3637..54d407347f8d5c7527ca47468ea5a29e2f777516 100644 (file)
--- a/regression-tests/nsec-middle/expected_result
+++ b/regression-tests/nsec-middle/expected_result
@@ -1 +1,2 @@
+1      example.com.    IN      NSEC    120     escapedtext.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      ns2.example.com.        IN      NSEC    120     outpost.example.com. A RRSIG NSEC

diff --git a/regression-tests/nsec-wraparound/expected_result b/regression-tests/nsec-wraparound/expected_result
index 71123441b19bc2d193bafbcdbb69c223cdeb3964..d99b62a39990b01fd0751753bfecbb6733a62e32 100644 (file)
--- a/regression-tests/nsec-wraparound/expected_result
+++ b/regression-tests/nsec-wraparound/expected_result
@@ -1 +1,2 @@
+1      example.com.    IN      NSEC    120     escapedtext.example.com. NS SOA MX RRSIG NSEC DNSKEY
 1      www.example.com.        IN      NSEC    120     example.com. CNAME RRSIG NSEC