2539. [security] Update the interaction between recursion, allow-query,

                        allow-query-cache and allow-recursion.  [RT #19198]

diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf
index a880708f0a74858b87cd59d7e9f1ef55ea68e0c3..f066823f078492b3ec3f4a3e026b78c47b60cb2a 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf
+++ b/bin/tests/system/glue/ns1/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10.18.3 2005/08/25 00:05:44 marka Exp $ */
+/* $Id: named.conf,v 1.10.18.4 2009/01/30 08:20:23 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -27,7 +27,7 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.1; };
        listen-on-v6 { none; };
-       recursion no;
+       recursion yes;
        notify no;
        cache-file "cache";
        check-integrity no;

diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 863b4658679ab2d3f32551b4611fce69074bfc8b..addb02dfd8b292c28e9e0579cd2dc79c66efe14b 100644 (file)
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf.in,v 1.4 2004/03/05 05:03:16 marka Exp $ */
+/* $Id: named.conf.in,v 1.4.18.1 2009/01/30 08:20:24 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -31,6 +31,7 @@ options {
        notify no;
        tkey-domain "server";
        tkey-dhkey "server" KEYID;
+       allow-query-cache { any; };
 };
 
 key "tkeytest." {