BIND 10 trac772, updated. 3912ef9b24104abea0e9344ff24deeed700712e3 Merge branch 'trac772' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10 into work/xfroutacl

[BIND 10 source code commits]

The branch, trac772 has been updated
       via  3912ef9b24104abea0e9344ff24deeed700712e3 (commit)
       via  5471e816ab36a6182b2223dea461fc8d086ed9e7 (commit)
      from  686ed44b82c009ddb63ed064d46ce44fcade5fbe (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 3912ef9b24104abea0e9344ff24deeed700712e3
Merge: 5471e816ab36a6182b2223dea461fc8d086ed9e7 686ed44b82c009ddb63ed064d46ce44fcade5fbe
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Jul 15 21:10:30 2011 +0200

    Merge branch 'trac772' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10 into work/xfroutacl

commit 5471e816ab36a6182b2223dea461fc8d086ed9e7
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Jul 15 21:07:57 2011 +0200

    [trac772] More review comments

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

Summary of changes:
 src/bin/xfrout/tests/xfrout_test.py.in |    8 +++++++-
 src/bin/xfrout/xfrout.py.in            |    2 +-
 src/bin/xfrout/xfrout.spec.pre.in      |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in
index 9492e43..5e9076b 100644
--- a/src/bin/xfrout/tests/xfrout_test.py.in
+++ b/src/bin/xfrout/tests/xfrout_test.py.in
@@ -559,6 +559,12 @@ class TestUnixSockServer(unittest.TestCase):
         sock.connect(('::1', 12345))
         self.assertEqual(('::1', 12345, 0, 0),
                          self.unix._guess_remote(sock.fileno()))
+        # Try when pretending there's no IPv6 support
+        xfrout.socket.has_ipv6 = False
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.connect(('127.0.0.1', 12345))
+        self.assertEqual(('127.0.0.1', 12345),
+                         self.unix._guess_remote(sock.fileno()))
 
     def test_receive_query_message(self):
         send_msg = b"\xd6=\x00\x00\x00\x01\x00"
@@ -572,7 +578,7 @@ class TestUnixSockServer(unittest.TestCase):
         context = isc.acl.dns.RequestContext(socket.getaddrinfo("127.0.0.1",
                                              1234, 0, 0, 0,
                                              socket.AI_NUMERICHOST)[0][4])
-        self.assertEqual(isc.acl.acl.REJECT, self.unix._acl.execute(context))
+        self.assertEqual(isc.acl.acl.ACCEPT, self.unix._acl.execute(context))
 
     def check_loaded_ACL(self):
         context = isc.acl.dns.RequestContext(socket.getaddrinfo("127.0.0.1",
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index f6731e5..b3ee8be 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -400,7 +400,7 @@ class UnixSockServer(socketserver_mixin.NoPollMixIn, ThreadingUnixStreamServer):
     def _common_init(self):
         self._lock = threading.Lock()
         self._transfers_counter = 0
-        self._acl = REQUEST_LOADER.load("[]")
+        self._acl = REQUEST_LOADER.load('[{"action": "ACCEPT"}]')
 
     def _receive_query_message(self, sock):
         ''' receive request message from sock'''
diff --git a/src/bin/xfrout/xfrout.spec.pre.in b/src/bin/xfrout/xfrout.spec.pre.in
index 71168aa..8ecbb0b 100644
--- a/src/bin/xfrout/xfrout.spec.pre.in
+++ b/src/bin/xfrout/xfrout.spec.pre.in
@@ -54,7 +54,7 @@
          "item_name": "query_acl",
          "item_type": "list",
          "item_optional": false,
-         "item_default": [],
+         "item_default": [{"action": "ACCEPT"}],
          "list_item_spec":
          {
              "item_name": "acl_element",