Skip to content

Commit

Permalink
unbreak.. well, everything. Brown paper bag commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter van Dijk committed Jun 24, 2013
1 parent bf7f822 commit 063076b
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pdns/dnspacket.cc
Expand Up @@ -310,13 +310,14 @@ void DNSPacket::wrapup()
if(pos->d_place == DNSResourceRecord::ANSWER || pos->d_place == DNSResourceRecord::AUTHORITY) { if(pos->d_place == DNSResourceRecord::ANSWER || pos->d_place == DNSResourceRecord::AUTHORITY) {
pw.getHeader()->tc=1; pw.getHeader()->tc=1;
} }
goto truncated; goto noCommit;
} }
} }


// if(!pw.getHeader()->tc) // protect against double commit from addSignature // if(!pw.getHeader()->tc) // protect against double commit from addSignature


if(!d_rrs.empty()) pw.commit(); if(!d_rrs.empty()) pw.commit();

noCommit:; noCommit:;


if(d_haveednssubnet) { if(d_haveednssubnet) {
Expand All @@ -328,10 +329,6 @@ void DNSPacket::wrapup()
opts.push_back(make_pair(::arg().asNum("edns-subnet-option-number"), opt)); opts.push_back(make_pair(::arg().asNum("edns-subnet-option-number"), opt));
} }


pw.commit();

truncated:;

if(!opts.empty() || d_haveednssection || d_dnssecOk) if(!opts.empty() || d_haveednssection || d_dnssecOk)
{ {
pw.addOpt(2800, 0, d_dnssecOk ? EDNSOpts::DNSSECOK : 0, opts); pw.addOpt(2800, 0, d_dnssecOk ? EDNSOpts::DNSSECOK : 0, opts);
Expand Down

0 comments on commit 063076b

Please sign in to comment.