From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 18 Jun 2013 17:02:49 +0000 (+0200)
Subject: fix OPT inclusion in truncated responses to EDNS queries
X-Git-Tag: rec-3.6.0-rc1~647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75fc7cbca4239cdeb9c8d9ce966a1154d7bfe841;p=pdns

fix OPT inclusion in truncated responses to EDNS queries
---

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 6c4707d6e..d7f082e68 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -310,7 +310,7 @@ void DNSPacket::wrapup()
           if(pos->d_place == DNSResourceRecord::ANSWER || pos->d_place == DNSResourceRecord::AUTHORITY) {
             pw.getHeader()->tc=1;
           }
-          goto noCommit;
+          goto truncated;
         }
       }
       
@@ -323,12 +323,15 @@ void DNSPacket::wrapup()
         opts.push_back(make_pair(::arg().asNum("edns-subnet-option-number"), opt));
       }
 
+      pw.commit();
+
+      truncated:;
+
       if(!opts.empty() || d_haveednssection || d_dnssecOk)
+      {
         pw.addOpt(2800, 0, d_dnssecOk ? EDNSOpts::DNSSECOK : 0, opts);
-
-      if(!pw.getHeader()->tc) // protect against double commit from addSignature
         pw.commit();
-      noCommit:;
+      }
     }
     catch(std::exception& e) {
       L<<Logger::Warning<<"Exception: "<<e.what()<<endl;
diff --git a/regression-tests/direct-rrsig/command b/regression-tests/direct-rrsig/command
index b21880c2f..138ab8213 100755
--- a/regression-tests/direct-rrsig/command
+++ b/regression-tests/direct-rrsig/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig example.com RRSIG
+cleandig example.com RRSIG dnssec
diff --git a/regression-tests/direct-rrsig/expected_result b/regression-tests/direct-rrsig/expected_result
index 8632b850c..04adefd9c 100644
--- a/regression-tests/direct-rrsig/expected_result
+++ b/regression-tests/direct-rrsig/expected_result
@@ -1,3 +1,4 @@
 1	example.com.	IN	SOA	86400	ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+2	.	IN	OPT	32768	
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=RRSIG
diff --git a/regression-tests/direct-rrsig/expected_result.dnssec b/regression-tests/direct-rrsig/expected_result.dnssec
index 0e19bc516..840b7fdd1 100644
--- a/regression-tests/direct-rrsig/expected_result.dnssec
+++ b/regression-tests/direct-rrsig/expected_result.dnssec
@@ -1,4 +1,8 @@
 0	example.com.	IN	RRSIG	100000	SOA 8 2 100000 [expiry] [inception] [keytag] example.com. ...
+0	example.com.	IN	RRSIG	120	MX 8 2 120 [expiry] [inception] [keytag] example.com. ...
 0	example.com.	IN	RRSIG	120	NS 8 2 120 [expiry] [inception] [keytag] example.com. ...
-Rcode: 0, RD: 0, QR: 1, TC: 1, AA: 1, opcode: 0
+0	example.com.	IN	RRSIG	86400	DNSKEY 8 2 86400 [expiry] [inception] [keytag] example.com. ...
+0	example.com.	IN	RRSIG	86400	NSEC 8 2 86400 [expiry] [inception] [keytag] example.com. ...
+2	.	IN	OPT	32768	
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=RRSIG