From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 10 Feb 2008 19:06:39 +0000 (+0000)
Subject: version updates + speed up 'must shuffle' logic
X-Git-Tag: rec-3.1.7.1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da73ef3ca6f2951f6cd0f2110b0bfe44899cf170;p=thirdparty%2Fpdns.git

version updates + speed up 'must shuffle' logic


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1138 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 162b30ceb3..0a6bec0944 100755
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -1,4 +1,4 @@
-VERSION=3.1.5-snapshot
+VERSION=3.1.5-snapshot3
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \
 rcpgenerator.hh lock.hh dnswriter.hh  dnsrecords.hh dnsparser.hh utility.hh \
diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 72906a5c74..7820440204 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -287,7 +287,9 @@ void DNSPacket::wrapup(void)
 
   stable_sort(rrs.begin(),rrs.end(),rrcomp);
 
-  if(!d_tcp && !arg().mustDo("no-shuffle")) {
+  static bool mustShuffle =arg().mustDo("no-shuffle");
+
+  if(!d_tcp && !mustShuffle) {
     shuffle(rrs);
   }
   d_wrapped=true;
diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec
index cddc5d6023..c72690e2ad 100644
--- a/pdns/pdns-recursor.spec
+++ b/pdns/pdns-recursor.spec
@@ -2,7 +2,7 @@
 
 Buildroot: /tmp/pdns/
 Name: pdns-recursor
-Version: 3.1.5snapshot
+Version: 3.1.5snapshot2
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver
 License: GPL