final cleanup

- add CHANGES note
- update copyrights and license headers
- add -j to the make commands in .gitlab-ci.yml to take
  advantage of parallelization in the gitlab CI process

.gitlab-ci.yml

@@ -86,7 +86,7 @@ stages:
     - ./autogen.sh
   script:
     - ./configure --with-libtool
-    - make -k all V=1
+    - make -j6 -k all V=1
   artifacts:
     expire_in: '1 hour'
     untracked: true
@@ -96,7 +96,7 @@ stages:
   before_script:
     - bash -x bin/tests/system/ifconfig.sh up
   script:
-    - make -k check V=1
+    - make -j5 -k check V=1
   artifacts:
     untracked: true
     expire_in: '1 week'

CHANGES

@@ -1,3 +1,8 @@
+4899.	[test]		Convert most of the remaining system tests to be able
+			to run in parallel, continuing the work from change
+			#4895. To take advantage of this, use "make -jN check",
+			where N is the number of processors to use. [GL #91]
+
 4898.	[func]		Remove libseccomp based system-call filtering. [GL #93]
 
 4897.	[test]		Update to rpz system test so that it doesn't recurse.

README.md

@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/README

@@ -1,10 +1,9 @@
-Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 Introduction
 ===
 This directory holds a simple test environment for running bind9 system tests

bin/tests/system/acl/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named1.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named2.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named3.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named4.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named5.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named6.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns2/named7.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns3/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/ns4/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/acl/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/ns1/named1.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/ns1/named2.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/ns1/named3.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/ns1/named4.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/ns3/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/additional/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns2/named1.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns2/named2.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns2/named3.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns3/named1.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/ns3/named2.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/addzone/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/allow_query/clean.sh

@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.2 2010/11/16 01:37:36 sar Exp $
-
 #
 # Clean up after allow query tests.
 #

bin/tests/system/allow_query/ns2/named01.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named01.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named02.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named02.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named03.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named03.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named04.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named04.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named05.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named05.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named06.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named06.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named07.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named07.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {

bin/tests/system/allow_query/ns2/named08.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named08.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.1; };
 
 options {

bin/tests/system/allow_query/ns2/named09.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named09.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {

bin/tests/system/allow_query/ns2/named10.conf.in

@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named10.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named11.conf.in

@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named11.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named12.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named12.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named21.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named21.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named22.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named22.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named23.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named23.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named24.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named24.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named25.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named25.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named26.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named26.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named27.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named27.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {

bin/tests/system/allow_query/ns2/named28.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named28.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.1; };
 
 options {

bin/tests/system/allow_query/ns2/named29.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named29.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {

bin/tests/system/allow_query/ns2/named30.conf.in

@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named30.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named31.conf.in

@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named31.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named32.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named32.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";

bin/tests/system/allow_query/ns2/named33.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named33.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named34.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named34.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named40.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named40.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 acl badaccept { 10.53.0.1; };

bin/tests/system/allow_query/ns2/named53.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named53.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named54.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named54.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named55.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named55.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named56.conf.in

@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named56.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/ns2/named57.conf.in

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";

bin/tests/system/allow_query/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/allow_query/tests.sh

@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: tests.sh,v 1.3 2010/12/02 23:22:41 marka Exp $
-
 # Test of allow-query statement.
 # allow-query takes an address match list and can be included in either the
 # options statement or in the zone statement.  This test assumes that the

bin/tests/system/ans.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/auth/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/ns2/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/ns3/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/ns4/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/ns5/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/autosign/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/builtin/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/builtin/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/builtin/ns2/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/builtin/ns3/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/builtin/tests.sh

@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/cacheclean/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/cacheclean/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/cacheclean/ns2/named.conf.in

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.10 2011/08/02 23:47:52 tbox Exp $ */
-
 options {
 	query-source address 10.53.0.2;
 	notify-source 10.53.0.2;

bin/tests/system/cacheclean/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/cacheclean/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/case/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/case/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/case/ns2/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/case/setup.sh

@@ -1,4 +1,4 @@
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/case/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/catz/clean.sh

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/catz/ns1/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/catz/ns2/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/catz/ns3/named.conf.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/catz/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

bin/tests/system/cds/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this