BIND 10 trac999, updated. 21a333f512f2a11ce0c770b7d72aacfb623d0c14 [trac999] renamed a test name as suggested in review.

[BIND 10 source code commits]

The branch, trac999 has been updated
       via  21a333f512f2a11ce0c770b7d72aacfb623d0c14 (commit)
      from  0c1589a0842cefe0793b538c53c1cb102080b570 (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 21a333f512f2a11ce0c770b7d72aacfb623d0c14
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jun 27 01:31:34 2011 -0700

    [trac999] renamed a test name as suggested in review.

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

Summary of changes:
 ChangeLog                                          |   13 +++++++++++++
 src/bin/resolver/tests/resolver_config_unittest.cc |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 3b1d518..e557ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+261.?	[func]*		jinmei
+	b10-resolver: Introduced ACL on incoming queries.  By default the
+	resolver accepts queries from ::1 and 127.0.0.1 and rejects all
+	others.  The ACL can be configured with bindctl via the
+	"Resolver/query_acl" parameter.  For example, to accept queries
+	from 192.0.2.0/24 (in addition to the default list), do this:
+	> config add Resolver/query_acl
+	> config set Resolver/query_acl[2]/action "ACCEPT"
+	> config set Resolver/query_acl[2]/from "192.0.2.0/24"
+	> config commit
+	(Trac #999, git TBD,
+	also based on other ACL related work done by stephen and vorner)
+
 260.	[func]      stephen
 	Remove comma between message identification and the message
 	text in the new-style logging messages.
diff --git a/src/bin/resolver/tests/resolver_config_unittest.cc b/src/bin/resolver/tests/resolver_config_unittest.cc
index a4c97c0..c328813 100644
--- a/src/bin/resolver/tests/resolver_config_unittest.cc
+++ b/src/bin/resolver/tests/resolver_config_unittest.cc
@@ -294,7 +294,7 @@ TEST_F(ResolverConfig, queryACLIPv6) {
                   createClient("2001:db8::1")));
 }
 
-TEST_F(ResolverConfig, compoundQueryACL) {
+TEST_F(ResolverConfig, multiEntryACL) {
     // A bit more complicated one: mixture of IPv4 and IPv6 with 3 rules
     // in total.  We shouldn't have to check so many variations of rules
     // as it should have been tested in the underlying ACL module.  All we