BIND 10 master, updated. ea679d6d1fc5105027de1f0243817c66a32fa8ac [master] update ChangeLog revision number

[BIND 10 source code commits]

The branch, master has been updated
       via  ea679d6d1fc5105027de1f0243817c66a32fa8ac (commit)
       via  510924ebc57def8085cc0e5413deda990b2abeee (commit)
       via  1d6b96dd3f682a4433a02f2f156fd118aac6f0e0 (commit)
       via  681b1839bca185f19eca8e0fe567bb0012743a79 (commit)
      from  ece21d1bcb8b6ef6015622427cdc784e951b7396 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea679d6d1fc5105027de1f0243817c66a32fa8ac
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date:   Wed Mar 30 09:12:22 2011 +0800

    [master] update ChangeLog revision number

commit 510924ebc57def8085cc0e5413deda990b2abeee
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date:   Wed Mar 30 09:11:05 2011 +0800

    [master] merge trac699: missing glue records for type ANY queries.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |    5 +++++
 src/bin/auth/query.cc                |    2 ++
 src/bin/auth/tests/query_unittest.cc |   12 ++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 0ee3d17..a85332b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+  210.  [bug]		jerry
+	src/bin/auth: fixed a bug where type ANY queries don't provide
+	additional glue records for ANSWER section.
+	(Trac #699, git 510924ebc57def8085cc0e5413deda990b2abeee)
+
   209.  [func]		jelte
 	Resolver now uses the NSAS when looking for a nameserver to
 	query for any specific zone. This also includes keeping track of
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index e936c97..323f890 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -210,6 +210,8 @@ Query::process() const {
                     // into answer section.
                     BOOST_FOREACH(RRsetPtr rrset, *target) {
                         response_.addRRset(Message::SECTION_ANSWER, rrset);
+                        // Handle additional for answer section
+                        getAdditional(*result.zone, *rrset.get());
                     }
                 } else {
                     response_.addRRset(Message::SECTION_ANSWER,
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 05dd748..c68b672 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -341,12 +341,20 @@ TEST_F(QueryTest, apexAnyMatch) {
     // in the answer section from the additional.
     EXPECT_NO_THROW(Query(memory_datasrc, Name("example.com"),
                           RRType::ANY(), response).process());
-    responseCheck(response, Rcode::NOERROR(), AA_FLAG, 4, 0, 0,
+    responseCheck(response, Rcode::NOERROR(), AA_FLAG, 4, 0, 3,
                   "example.com. 3600 IN SOA . . 0 0 0 0 0\n"
                   "example.com. 3600 IN NS glue.delegation.example.com.\n"
                   "example.com. 3600 IN NS noglue.example.com.\n"
                   "example.com. 3600 IN NS example.net.\n",
-                  NULL, NULL, mock_zone->getOrigin());
+                  NULL, ns_addrs_txt, mock_zone->getOrigin());
+}
+
+TEST_F(QueryTest, mxANYMatch) {
+    EXPECT_NO_THROW(Query(memory_datasrc, Name("mx.example.com"),
+                          RRType::ANY(), response).process());
+    responseCheck(response, Rcode::NOERROR(), AA_FLAG, 3, 3, 4,
+                  mx_txt, zone_ns_txt,
+                  (string(ns_addrs_txt) + string(www_a_txt)).c_str());
 }
 
 TEST_F(QueryTest, glueANYMatch) {