From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 5 Nov 2006 13:49:31 +0000 (+0000)
Subject: update version to 3.1.4-pre2
X-Git-Tag: rec-3.1.4~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc28bef8dd410aca2469d6bcb7ea0b405e3b3f31;p=pdns

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 33e250827..0fc7db4d3 100644
--- 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 aa1ff1166..b456abc02 100644
--- 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 e3ce0696c..928a34755 100755
--- 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 3d8bd5f9f..9ab7b3658 100644
--- 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 ff365e06b..7f37aac2f 100644
--- 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 45a07a892..8342109f1 100644
--- 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 4b817551e..9ce0d3712 100644
--- 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