]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
unbreak.. well, everything. Brown paper bag commit.
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Thu, 20 Jun 2013 14:10:58 +0000 (16:10 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 24 Jun 2013 09:41:05 +0000 (11:41 +0200)
pdns/dnspacket.cc

index 782c01b3620f15afd65792d13917ebc14268abc9..327ff15ddf71e5b59e883975c018115127196e91 100644 (file)
@@ -310,13 +310,14 @@ void DNSPacket::wrapup()
           if(pos->d_place == DNSResourceRecord::ANSWER || pos->d_place == DNSResourceRecord::AUTHORITY) {
             pw.getHeader()->tc=1;
           }
-          goto truncated;
+          goto noCommit;
         }
       }
 
       // if(!pw.getHeader()->tc) // protect against double commit from addSignature
 
       if(!d_rrs.empty()) pw.commit();
+
       noCommit:;
       
       if(d_haveednssubnet) {
@@ -328,10 +329,6 @@ 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);