From 87248e6a6abba896a2c34005dbf310f1eaca2a4e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 30 Jan 2009 08:20:24 +0000 Subject: [PATCH] 2539. [security] Update the interaction between recursion, allow-query, allow-query-cache and allow-recursion. [RT #19198] --- bin/tests/system/glue/ns1/named.conf | 4 ++-- bin/tests/system/tkey/ns1/named.conf.in | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf index a880708f0a..f066823f07 100644 --- 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 863b465867..addb02dfd8 100644 --- 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." {