Merge branch 'rfc2136' of https://github.com/mind04/pdns into rfc2136

Conflicts:
	.travis.yml
	pdns/common_startup.cc
	pdns/dnspacket.cc
	pdns/dnspacket.hh
	regression-tests/start-test-stop

diff --cc .travis.yml
index 20478f908c2abcacce08198198df91697f8195f7,40e4bbdd7d671583102efb03bcef652a95efcdfb..fd477bf5431e745d43c823ae40cdd007adc36a87
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -9,11 -8,12 +9,11 @@@ before_script
   - sudo restart mysql
  script:
   - ./bootstrap
-  - ./configure --with-modules='pipe remote gmysql tinydns random' --with-sqlite3 --enable-unit-tests --enable-remotebackend-http
 - - ./configure --with-modules='gmysql mydns tinydns random' --with-sqlite3 --enable-unit-tests
++ - ./configure --with-modules='pipe remote gmysql tinydns random mydns' --with-sqlite3 --enable-unit-tests --enable-remotebackend-http
   - make dist
   - make -j 4
 + - make check
   - cd pdns
 - - make testrunner
 - - ./testrunner
   - cd docs
   - make
   - cd ../../regression-tests
@@@ -35,9 -36,14 +36,17 @@@
   - ./start-test-stop 5300 gmysql-nsec3-optout
   - ./start-test-stop 5300 gmysql-nsec3-optout-presigned 
   - ./start-test-stop 5300 gmysql-nsec3-narrow
 - - ./start-test-stop 5300 tinydns
 + - ./start-test-stop 5300 tinydns 
 + - ./start-test-stop 5300 remotebackend-pipe
 + - ./start-test-stop 5300 remotebackend-pipe-dnssec
+  - ./start-test-stop 5300 gmysql nowait 3600
+  - ./start-test-stop 5300 gmysql-presigned nowait 3600
+  - ./start-test-stop 5300 gmysql-nsec3 nowait 3600
+  - ./start-test-stop 5300 gmysql-nsec3-presigned nowait 3600
+  - ./start-test-stop 5300 gmysql-nsec3-narrow nowait 3600
+  - ./start-test-stop 5300 gmysql-nsec3-optout nowait 3600
+  - ./start-test-stop 5300 gmysql-nsec3-optout-presigned nowait 3600
++ - ./start-test-stop 5300 mydns
   - cd ../regression-tests.nobackend/
   - ./runtests
   - test ! -s ./failed_tests

diff --cc pdns/Makefile.am
index cf1f2b65162985e0e654d71d98400d5ade52bc95,5fd85c03927558afe5cd1062c35292dd47246bbf..d14778f0f6823e52641af25cd1dc43134a51374b
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -108,10 -108,10 +108,10 @@@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeep
        aes/aescpp.h \
        aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \
        aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc \
-       serialtweaker.cc 
+       serialtweaker.cc
  
  
 -pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
 +pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
  pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
  
  if BOTAN110

diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge

diff --cc pdns/common_startup.cc
index 5ce0311265b577e1657d3dbb4ab49a26b6176e08,d126cd9bcf9a46434b6145f099946ec05beb47ad..66cece57a262eb7e18124d89e9ee230d602b5981
--- 1/pdns/common_startup.cc
--- 2/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@@ -339,15 -341,9 +345,15 @@@ void mainthread(
     
     g_anyToTcp = ::arg().mustDo("any-to-tcp");
     g_addSuperfluousNSEC3 = ::arg().mustDo("add-superfluous-nsec3-for-old-bind");
-    DNSPacket::s_udpTruncationThreshold = ::arg().asNum("udp-truncation-threshold");
+    DNSPacket::s_udpTruncationThreshold = std::max(512, ::arg().asNum("udp-truncation-threshold"));
     DNSPacket::s_doEDNSSubnetProcessing = ::arg().mustDo("edns-subnet-processing");
 -   
 +   {
 +      std::vector<std::string> codes;
 +      stringtok(codes, ::arg()["edns-subnet-option-numbers"], "\t ,");
 +      BOOST_FOREACH(std::string &code, codes) {
 +         DNSPacket::s_ednssubnetcodes.push_back(boost::lexical_cast<int>(code));
 +      }
 +   }
  #ifndef WIN32
     if(!::arg()["chroot"].empty()) {  
       if(::arg().mustDo("master") || ::arg().mustDo("slave"))

diff --cc pdns/dnsbackend.hh
Simple merge

diff --cc pdns/dnspacket.cc
Simple merge

diff --cc pdns/docs/pdns.xml
index 48e2069da687a5decaa6174d8614da28f3ccef12,662e1b82be4e6de7e06719f50efdd933e71fdb1c..e169ad0cbff56d5823d5d2a73e3f65f2429ddbf3
mode 100644,100755..100755
--- 1/pdns/docs/pdns.xml
--- 2/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml

diff --cc pdns/misc.hh
Simple merge

diff --cc pdns/nameserver.cc
Simple merge

diff --cc pdns/packethandler.cc
Simple merge

diff --cc pdns/pdns.conf-dist
Simple merge

diff --cc pdns/pdnssec.cc
Simple merge

diff --cc pdns/resolver.cc
Simple merge

diff --cc pdns/sdig.cc
Simple merge

diff --cc pdns/slavecommunicator.cc
Simple merge

diff --cc pdns/tcpreceiver.cc
Simple merge

diff --cc regression-tests/start-test-stop
index 52762df823fedebb7b3903f5b62a2b1757e285e2,dbdba21e4314f15e4ca25825f61f1a1707a3fee2..e9aaa6b509ee75abbe1c33bb4076d6b43758c9a0
--- 1/regression-tests/start-test-stop
--- 2/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@@ -307,9 -285,10 +326,10 @@@ __EOF_
                        done
  
                        $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
-                               --no-shuffle --launch --launch+=random --launch+=gmysql --gmysql-dnssec \
-                               --fancy-records --send-root-referral \
-                               --cache-ttl=0 --no-config \
 -                              --no-shuffle --launch=random,gmysql --gmysql-dnssec \
++                              --no-shuffle --launch+=random --launch+=gmysql --gmysql-dnssec \
+                               --send-root-referral \
+                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --experimental-direct-dnskey=yes \
+                               --cache-ttl=$cachettl --no-config \
                                --gmysql-dbname="$GMYSQLDB" \
                                --gmysql-user="$GMYSQLUSER" \
                                --gmysql-host="$GMYSQLHOST" \
@@@ -540,14 -522,14 +565,14 @@@ __EOF_
                        if [ "$remotesec" = "nsec3" ]; then
                                remotedosec="yes"
                                if [ "$narrow" = "narrow" ]; then
-                                                                       extracontexts="dnssec nsec3 narrow"
-                                       skipreasons="narrow nsec3"
-                                       else 
 -                                      extracontexts="dnssec nsec3 narrow"
++                                      extracontexts="dnssec nsec3 narrow"
+                                       skipreasons="narrow nsec3 nodyndns"
 -                              else 
++                              else 
                                        extracontexts="dnssec nsec3"
-                                       skipreasons="nsec3"
+                                       skipreasons="nsec3 nodyndns"
                                fi
 -                              remote_add_param="--remote-dnssec=yes"
 -                        else 
 +                                                      remote_add_param="--remote-dnssec=yes"
 +                                              else 
                                if [ "$remotesec" = "dnssec" ]; then
                                        remotedosec="yes"
                                        remote_add_param="--remote-dnssec=yes"
@@@ -564,10 -546,11 +589,11 @@@ EO
  
                        $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                                --no-shuffle --launch=remote \
-                               --query-logging --loglevel=9 --cache-ttl=0 --no-config \
+                               --query-logging --loglevel=9 --cache-ttl=$cachettl --no-config \
                                --send-root-referral \
+                               --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
                                --remote-connection-string="$connstr" $remote_add_param &
 -                        
 +                                              
                        echo "Setting up test database..."
                        # setup test database
                        rm -f $testsdir/remote.sqlite3
@@@ -642,8 -626,9 +671,9 @@@ the
  
                $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./  \
                        --no-shuffle --launch=gmysql --gmysql-dnssec \
-                       --fancy-records --send-root-referral \
-                       --cache-ttl=0 --query-cache-ttl=0 --no-config --slave --retrieval-threads=4 \
+                       --send-root-referral \
+                       --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
 -                      --cache-ttl=$cachettl --query-cache-ttl=$cachettl --no-config --slave --retrieval-threads=1 \
++                      --cache-ttl=$cachettl --query-cache-ttl=$cachettl --no-config --slave --retrieval-threads=4 \
                        --gmysql-dbname="$GMYSQL2DB" \
                        --gmysql-user="$GMYSQL2USER" \
                        --gmysql-host="$GMYSQL2HOST" \