[master] Merge branch 'trac1570'

diff --cc src/bin/auth/query.cc
index 7fe085e5bafe2fcf4c80b7cfeceb1b81cec46645,62e4b8278b8c3581f33050710e56ecc926ffca73..1ba0a528127fe7e3af493742626537b7db333842
--- 1/src/bin/auth/query.cc
--- 2/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@@ -389,9 -413,17 +413,17 @@@ Query::process() 
              }
              break;
          case ZoneFinder::DELEGATION:
+             // If a DS query resulted in delegation, we also need to check
+             // if we are an authority of the child, too.  If so, we need to
+             // complete the process in the child as specified in Section
+             // 2.2.1.2. of RFC3658.
+             if (qtype_ == RRType::DS() && processDSAtChild()) {
+                 return;
+             }
+ 
              response_.setHeaderFlag(Message::HEADERFLAG_AA, false);
              response_.addRRset(Message::SECTION_AUTHORITY,
 -                boost::const_pointer_cast<RRset>(db_result.rrset),
 +                boost::const_pointer_cast<AbstractRRset>(db_result.rrset),
                  dnssec_);
              // If DNSSEC is requested, see whether there is a DS
              // record for this delegation.

diff --cc src/bin/auth/query.h
Simple merge

diff --cc src/bin/auth/tests/query_unittest.cc
Simple merge

diff --cc src/lib/datasrc/tests/memory_datasrc_unittest.cc
Simple merge