From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 20 Jun 2013 14:10:58 +0000 (+0200)
Subject: unbreak.. well, everything. Brown paper bag commit.
X-Git-Tag: auth-3.3-rc2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=063076b722d19405e9860484238b99895670c78d;p=thirdparty%2Fpdns.git

unbreak.. well, everything. Brown paper bag commit.
---

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 782c01b362..327ff15ddf 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -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);