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 162b30ceb3cf1a817f24829f32e4519c86517511..0a6bec09442d5e18cc77e08e04bb3bc63a85d1ba 100755 (executable)
--- 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 72906a5c742e9326dee2596345348337e8bc4cba..782044020452c68e0cf6dd833c119cd88e7e4005 100644 (file)
--- 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 cddc5d602347571eacd320c79a73c652687bf17c..c72690e2ad26e8f5fdc0be6482b5560ba689dcb8 100644 (file)
--- 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