don't include NSEC3 on positive ANY response, closing #610

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

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 90301f09408e261b9c0b1890bfc67db0bbf8f7a3..89bce776fd2ed6ef0098a574c724b25e7e7e7a1c 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -595,7 +595,7 @@ void PacketHandler::addNSEC3(DNSPacket *p, DNSPacket *r, const string& target, c
   }
   
   // add matching NSEC3 RR
-  if (mode != 3) {
+  if (mode != 3 && mode != 5) {
     unhashed=(mode == 0 || mode == 5) ? target : closest;
 
     hashed=hashQNameWithSalt(ns3rc.d_iterations, ns3rc.d_salt, unhashed);

diff --git a/regression-tests/any-query/expected_result.narrow b/regression-tests/any-query/expected_result.narrow
index 09d8a60b08787dbd2402cd7c43d8f4d0a6385f85..2abf1093f078bb089f14c2162a9b094020c94ffa 100644 (file)
--- a/regression-tests/any-query/expected_result.narrow
+++ b/regression-tests/any-query/expected_result.narrow
@@ -7,7 +7,6 @@
 0      example.com.    IN      NS      120     ns2.example.com.
 0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
 0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-0      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTNQ6OCN2VKUIV3NJU14OQTAEN2MT5SL NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2      .       IN      OPT     0       
 2      ns1.example.com.        IN      A       120     192.168.1.1
 2      ns2.example.com.        IN      A       120     192.168.1.2

diff --git a/regression-tests/any-query/expected_result.nsec3 b/regression-tests/any-query/expected_result.nsec3
index b75a964149da50ceeb8711a17ada9b2284fa1584..2abf1093f078bb089f14c2162a9b094020c94ffa 100644 (file)
--- a/regression-tests/any-query/expected_result.nsec3
+++ b/regression-tests/any-query/expected_result.nsec3
@@ -7,7 +7,6 @@
 0      example.com.    IN      NS      120     ns2.example.com.
 0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
 0      example.com.    IN      SOA     100000  ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-0      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
 2      .       IN      OPT     0       
 2      ns1.example.com.        IN      A       120     192.168.1.1
 2      ns2.example.com.        IN      A       120     192.168.1.2