auth: Serve NSEC3PARAM when asked without DO

Closes #9877

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index fd04e9f4a209f46618f5a6ebafd0b6880fea9f74..6ec607c94ee107ca087564cd666100cdae8e78f0 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1362,7 +1362,7 @@ std::unique_ptr<DNSPacket> PacketHandler::doQuestion(DNSPacket& p)
             goto sendit;
         }
       }
-      if(d_dnssec && p.qtype.getCode() == QType::NSEC3PARAM)
+      if(p.qtype.getCode() == QType::NSEC3PARAM)
       {
         if(addNSEC3PARAM(p,r))
           goto sendit;

diff --git a/regression-tests/tests/direct-nsec3param/command b/regression-tests/tests/direct-nsec3param/command
index e03b139e175c624d311edfb882d1c2297fa5e929..798c2e28e2e43cb1d7505543b50e1bda89cf0d9e 100755 (executable)
--- a/regression-tests/tests/direct-nsec3param/command
+++ b/regression-tests/tests/direct-nsec3param/command
@@ -1,2 +1,3 @@
 #!/bin/sh
 cleandig example.com NSEC3PARAM dnssec
+cleandig example.com NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result b/regression-tests/tests/direct-nsec3param/expected_result
index 6f4bef5154ad4117e1d2a486b735c1db8e376253..8a0c13611efab4817216d9c20021fc3ac55146ed 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result
+++ b/regression-tests/tests/direct-nsec3param/expected_result
@@ -2,3 +2,6 @@
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
+1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.dnssec b/regression-tests/tests/direct-nsec3param/expected_result.dnssec
index 368bf822307f678888e9c2d3dfab59b55ff65608..9a45f8852608c975e2b6129a68ec91ead1ef6904 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.dnssec
+++ b/regression-tests/tests/direct-nsec3param/expected_result.dnssec
@@ -5,3 +5,6 @@
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
+1      example.com.    IN      SOA     86400   ns1.example.com. ahu.example.com. 2847484148 28800 7200 604800 86400
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.narrow b/regression-tests/tests/direct-nsec3param/expected_result.narrow
index 3b601e08d253959430cb95cf7fe70299dcc68d23..f86656c93ba09b68dca81e3a35f47716fab462af 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.narrow
+++ b/regression-tests/tests/direct-nsec3param/expected_result.narrow
@@ -3,3 +3,6 @@
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
+0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='example.com.', qtype=NSEC3PARAM

diff --git a/regression-tests/tests/direct-nsec3param/expected_result.nsec3 b/regression-tests/tests/direct-nsec3param/expected_result.nsec3
index 3b601e08d253959430cb95cf7fe70299dcc68d23..f86656c93ba09b68dca81e3a35f47716fab462af 100644 (file)
--- a/regression-tests/tests/direct-nsec3param/expected_result.nsec3
+++ b/regression-tests/tests/direct-nsec3param/expected_result.nsec3
@@ -3,3 +3,6 @@
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=NSEC3PARAM
+0      example.com.    IN      NSEC3PARAM      86400   1 0 1 abcd
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='example.com.', qtype=NSEC3PARAM