rename allow_query to allow-query

bin/tests/system/Makefile.in

@@ -51,7 +51,7 @@ feature-test@EXEEXT@: feature-test.@O@
 # such as allow_query and serve-stale are scheduled first to get more
 # benefit from parallelism.
 
-PARALLEL = allow_query rpzrecurse serve-stale \
+PARALLEL = allow-query rpzrecurse serve-stale \
 	   acl additional addzone auth autosign \
 	   builtin cacheclean case catz cds chain \
 	   checkconf checknames checkzone \

bin/tests/system/allow-query/ns2/aclallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: aclallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN aclallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/acldisallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: acldisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN acldisallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/aclnotallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: aclnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN aclnotallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/added.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: added.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN added.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/addrallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: addrallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/addrdisallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: addrdisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrdisallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
@@ -24,4 +22,3 @@ ns2			A	10.53.0.2
 
 a			A	10.0.6.1
 mail			A	10.0.6.2
-

bin/tests/system/allow-query/ns2/addrnotallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: addrnotallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN addrnotallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/any.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: any.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN any.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/keyallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: keyallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN keyallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/keydisallow.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: keydisallow.db,v 1.2 2010/11/16 01:37:37 sar Exp $
-
 $ORIGIN keydisallow.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/named23.conf.in

@@ -33,4 +33,3 @@ view "internal" {
 		file "normal.db";
 	};
 };
-

bin/tests/system/allow-query/ns2/named40.conf.in

@@ -103,5 +103,3 @@ zone "keydisallow.example" {
 	file "keydisallow.db";
 	allow-query { ! key one; };
 };
-
-

bin/tests/system/allow-query/ns2/none.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: none.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN none.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/normal.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: normal.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN normal.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/ns2/previous.db

@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: previous.db,v 1.2 2010/11/16 01:37:39 sar Exp $
-
 $ORIGIN previous.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (

bin/tests/system/allow-query/tests.sh

@@ -17,29 +17,29 @@
 # expected match.
 # Test list:
 # In options:
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # Each of these tests requires changing to a new configuration
 # file and using rndc to update the server
 #
 # In view, with nothing in options (default to any)
-# default (any), any, none, [localhost, localnets], 
+# default (any), any, none, [localhost, localnets],
 # allowed address, not allowed address, denied address,
-# allowed key, not allowed key, denied key 
-# allowed acl, not allowed acl, denied acl (acls pointing to addresses) 
+# allowed key, not allowed key, denied key
+# allowed acl, not allowed acl, denied acl (acls pointing to addresses)
 #
 # In view, with options set to none, view set to any
 # In view, with options set to any, view set to none
 #
 # In zone, with nothing in options (default to any)
-# any, none, [localhost, localnets], 
-# allowed address, denied address, 
+# any, none, [localhost, localnets],
+# allowed address, denied address,
 # allowed key, not allowed key, denied key
 # allowed acl, not allowed acl, denied acl (acls pointing to addresses),
-# 
+#
 # In zone, with options set to none, zone set to any
 # In zone, with options set to any, zone set to none
 # In zone, with view set to none, zone set to any
@@ -47,7 +47,7 @@
 #
 # zone types of master, slave and stub can be tested in parallel by using
 # multiple instances (ns2 as master, ns3 as slave, ns4 as stub) and querying
-# as necessary. 
+# as necessary.
 #
 
 SYSTEMTESTTOP=..

bin/tests/system/conf.sh.in

@@ -86,7 +86,7 @@ SEQUENTIALDIRS="ecdsa eddsa gost @PKCS11_TEST@ tkey"
 # test, these tests can be run in parallel.
 #
 # This symbol must be kept in step with the PARALLEL macro in Makefile.in
-PARALLELDIRS="acl additional addzone allow_query auth autosign \
+PARALLELDIRS="acl additional addzone allow-query auth autosign \
 	builtin cacheclean case catz cds chain \
 	checkconf checknames checkzone \
 	@CHECKDS@ @COVERAGE@ @KEYMGR@ \