update version to 3.1.4-pre2

add support for "send-root-referral=lean"
add dnsgram to Makefile

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

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 33e2508278104433270e013b3891cca40c7ee908..0fc7db4d3797e45d124f9abc353accb3a58d3f5e 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -19,7 +19,7 @@ bin_PROGRAMS = pdns_control
 endif
 
 
-EXTRA_PROGRAMS=pdns_recursor sdig dnspbench pdns_control qgen dnsscope dnsreplay_mindex dnswasher dnsreplay dnsscan dnslog
+EXTRA_PROGRAMS=pdns_recursor sdig dnspbench pdns_control qgen dnsscope dnsgram dnsreplay_mindex dnswasher dnsreplay dnsscan dnslog
 
 pdns_server_SOURCES=dnspacket.cc nameserver.cc tcpreceiver.hh \
 qtype.cc logger.cc arguments.cc packethandler.cc tcpreceiver.cc \
@@ -96,6 +96,13 @@ dnsscope_SOURCES=dnsscope.cc misc.cc unix_utility.cc qtype.cc \
 
 dnsscope_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@
 
+dnsgram_SOURCES=dnsgram.cc misc.cc unix_utility.cc qtype.cc \
+       logger.cc statbag.cc  dnspcap.cc dnspcap.hh dnsparser.cc dnsrecords.cc \
+       base64.cc base64.hh dnswriter.cc dnswriter.hh rcpgenerator.cc rcpgenerator.hh \
+       utility.hh dnsparser.hh
+
+
+
 
 # INCLUDES=-I/usr/include/mysql
 

diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h
index aa1ff1166025b9aeb23592d6dcac144b927d3193..b456abc020741525e74956b4efa23ea48234689f 100644 (file)
--- a/pdns/config-recursor.h
+++ b/pdns/config-recursor.h
@@ -1,6 +1,6 @@
 #define SYSCONFDIR "/etc/powerdns/" 
 #define LOCALSTATEDIR "/var/run/" 
-#define VERSION "3.1.4-snapshot"
+#define VERSION "3.1.4-pre2"
 #define RECURSOR
 #ifndef WIN32
 #define GCC_SKIP_LOCKING

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index e3ce0696c41a2b6b5753ae0cd9b6821a15d38973..928a34755d2ca23f0df18a051842ad7be5c86cbd 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -1,4 +1,4 @@
-VERSION=3.1.4-snapshot
+VERSION=3.1.4-pre2
 
 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/packer-recursor/changelog b/pdns/packer-recursor/changelog
index 3d8bd5f9f1bfd18666a7081f5a988c44256b3f73..9ab7b36588b065d582d6e73548bba2a3f3620be1 100644 (file)
--- a/pdns/packer-recursor/changelog
+++ b/pdns/packer-recursor/changelog
@@ -1,3 +1,7 @@
+3.1.4-pre2-1
+Sun, 05 Nov 2006 14:47:42 +0100
+* almost ready!
+-- bert hubert <bert.hubert@netherlabs.nl>
 3.1.3-1
 Tue, 12 Sep 2006 20:21:28 +0200
 * 3.1.3 release

diff --git a/pdns/packer-recursor/version b/pdns/packer-recursor/version
index ff365e06b9577c96dfeadddb8c4cccb09b85665c..7f37aac2fe7b23b7678144a93c7109d6216eb757 100644 (file)
--- a/pdns/packer-recursor/version
+++ b/pdns/packer-recursor/version
@@ -1 +1 @@
-3.1.3
+3.1.4-pre2

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 45a07a8922e77a02dec7fd51b61ea75ebc60943a..8342109f115c62a119029719ec8a502ec6b9a6e2 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -18,7 +18,7 @@
 #include "utility.hh"
 #include <string>
 #include <sys/types.h>
-
+#include <boost/algorithm/string.hpp>
 #include "dns.hh"
 #include "dnsbackend.hh"
 #include "ueberbackend.hh"
@@ -83,6 +83,9 @@ void PacketHandler::addRootReferral(DNSPacket* r)
     r->addRecord(rr);
   }
 
+  if(boost::iequals(arg()["send-root-referral"], "lean"))
+     return;
+
   // add the additional stuff
   
   rr.ttl=3600000;

diff --git a/pdns/pdns-recursor.spec b/pdns/pdns-recursor.spec
index 4b817551ec5e7df26a0d9b90b91a47b34a85a115..9ce0d37120aa6c3378a49785398b6fa51f65effc 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.3
+Version: 3.1.4pre2
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver
 License: GPL