reinstate 'recursor' handoff in auth server, issue spotted by Detlef Peeters

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

diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index a725658bc6c7e85f5c974878d2689c13e8f0da13..4202f1610da4bf989d5d9815857092248804d845 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -122,7 +122,7 @@
        Miek Gieben (SIDN), Stephane Bortzmeyer (AFNIC), Michael Braunoeder (nic.at), Peter van Dijk, Maik Zumstrull,
        Jose Arthur Benetasso Villanova (Locaweb), Stefan Schmidt, Roland van Rijswijk (Surfnet), Paul Bakker (Brainspark/Fox-IT),
        Mathew Hennessy, Johannes Kuehrer (Austrian World4You GmbH), Marc van de Geijn (bHosted.nl), Stefan Arentz and 
-       Martin van Hensbergen (Fox-IT)
+       Martin van Hensbergen (Fox-IT), Detlef Peeters
       </para>
       <para>
        On to the release notes. Next to DNSSEC, other major new features include:
@@ -9888,6 +9888,7 @@ $ pdnssec rectify-zone
     <listitem><para>Martin van Hensbergen (Fox-IT)</para></listitem>
     <listitem><para>Christoph Meerwald</para></listitem>
     <listitem><para>Leen Besselink</para></listitem>
+    <listitem><para>Detlef Peeters</para></listitem>
     <listitem><para>.. this list is far from complete yet .. </para></listitem>
     </itemizedlist>
 

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 2b1cf249643957b514a10782b9e8b2320bee8686..7f65ab454dcf5d10585a7aacc6a2d19fea0814b0 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -38,7 +38,7 @@
 #include "communicator.hh"
 #include "dnsproxy.hh"
 
-#if 0
+#if 1
 #undef DLOG
 #define DLOG(x) x
 #endif 
@@ -1225,6 +1225,12 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     }
     
     if(!getAuth(p, &sd, target, 0)) {
+      if(r->d.ra) {
+        *shouldRecurse=true;
+        delete r;
+        return 0;
+      }
+       
       r->setA(false);
       if(::arg().mustDo("send-root-referral")) {
         DLOG(L<<Logger::Warning<<"Adding root-referral"<<endl);