final cleanup

- add CHANGES note
- update copyrights and license headers

diff --git a/CHANGES b/CHANGES
index 65190eea40a2943a8a445e10f61c04268606c210..659be45ad9f142f6265803cf245083b82a962e33 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+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]
+
+4895.  [test]          Allow some system tests to run in parallel.
+                       [RT #46602]
+
 4893.  [bug]           Address various issues reported by cppcheck. [GL #51]
 
 4892.  [bug]           named could leak memory when "rndc reload" was invoked

diff --git a/Makefile.in b/Makefile.in
index c098ef02e3cb1a0a341539dd20deccb2611b6ff0..7f5968cc89d96ddf1352247589cbfa2dcad2ea3e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/mdig.c b/bin/tests/mdig.c
index b99079ef28c3a246d76afc78790adf671372ff7e..80e6035ba593d5401539c706c2849192681db996 100644 (file)
--- a/bin/tests/mdig.c
+++ b/bin/tests/mdig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017.2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2017.2018, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 64cf7534f5cd3b121cc46226fa6301b6dcd0f815..0204b759873f0e2b02fcd1a1f9849ecd81985a5c 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2008, 2010-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008, 2010-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/README b/bin/tests/system/README
index b383866cbdad0f9ba5bd00fc0817bb3737ca391f..849b5464d6c6390cafde94484c7b230776853921 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -1,4 +1,4 @@
-Copyright (C) 2004, 2010, 2011, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004, 2010, 2011, 2013, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 

diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh
index 3c28f6fbd8dabf9a81462795385e7f38fe930a55..9c7d18445e5fb18e8e3a662bd5b6383298b075df 100644 (file)
--- a/bin/tests/system/acl/clean.sh
+++ b/bin/tests/system/acl/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
index 562156f28ca8a889300112b23091b832d170535e..a44b3f6a4eb6c6049eedc8806ffa161ac3441cb9 100644 (file)
--- a/bin/tests/system/acl/ns2/named1.conf.in
+++ b/bin/tests/system/acl/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -38,13 +38,13 @@ options {
 };
 
 key one {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 key two {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 zone "." {
@@ -60,5 +60,5 @@ zone "example" {
 zone "tsigzone" {
        type master;
        file "tsigzone.db";
-        allow-transfer { !key one; any; };
+       allow-transfer { !key one; any; };
 };

diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
index 5c53f094d4a4c46d94ebcfe1e01c144d3b927eca..e65ef8475de75076da059039cfd2c72a9a2defc4 100644 (file)
--- a/bin/tests/system/acl/ns2/named2.conf.in
+++ b/bin/tests/system/acl/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
index c031abf5d91ca149f30709674d71ebcc1a5a465d..ddc1318d780b45227b698b814412050b4f431cbb 100644 (file)
--- a/bin/tests/system/acl/ns2/named3.conf.in
+++ b/bin/tests/system/acl/ns2/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -38,26 +38,26 @@ options {
 };
 
 key one {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 key two {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 key three {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 acl reject {
-        !key one; !key two; any;
+       !key one; !key two; any;
 };
 
 acl accept {
-        10.53.0.1; 10.53.0.2;
+       10.53.0.1; 10.53.0.2;
 };
 
 zone "." {
@@ -73,5 +73,5 @@ zone "example" {
 zone "tsigzone" {
        type master;
        file "tsigzone.db";
-        allow-transfer { !reject; accept; };
+       allow-transfer { !reject; accept; };
 };

diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
index 75159d919afe2ceda539b75c19625c0101317a64..d066bcc8c76456a16fc1c334bf630d0e5dbc0d6b 100644 (file)
--- a/bin/tests/system/acl/ns2/named4.conf.in
+++ b/bin/tests/system/acl/ns2/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -38,21 +38,21 @@ options {
 };
 
 key one {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 key two {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 acl rejectkeys {
-        !key one; !key two; any;
+       !key one; !key two; any;
 };
 
 acl rejectaddrs {
-        !10.53.0.1; !10.53.0.2; any;
+       !10.53.0.1; !10.53.0.2; any;
 };
 
 acl check1 { !key one; 10.53.0.1; };
@@ -72,5 +72,5 @@ zone "example" {
 zone "tsigzone" {
        type master;
        file "tsigzone.db";
-        allow-transfer { !rejectkeys; !rejectaddrs; !check1; !check2; any; };
+       allow-transfer { !rejectkeys; !rejectaddrs; !check1; !check2; any; };
 };

diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index 48e3ac7f16a3a331eebfc4508448b6449692413a..9caf9857027cd44b686027e1721225bcd8213763 100644 (file)
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/ns3/named.conf.in b/bin/tests/system/acl/ns3/named.conf.in
index b8e9f2740f31c711b93a7e057dfae8cc47c44252..0668d964e4381219fe56b3bfeb07e9fd980b9f48 100644 (file)
--- a/bin/tests/system/acl/ns3/named.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.in
index 722a419323fde48980497c452fedc8f220009738..5f8aa110a402418d4f2b1b2e0c6347f719fee515 100644 (file)
--- a/bin/tests/system/acl/ns4/named.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index 6f998fd8d12aa0b175d13a1497204df15fdac2c1..f3d8b8a81b8a50a5e2a1f763717bfd58b382cc39 100644 (file)
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index 5272c0eaa9f6d1bc3634e5f3971155838e633c20..eedaa5eb870857132ab9352076e50027e4abe48f 100644 (file)
--- a/bin/tests/system/acl/tests.sh
+++ b/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/clean.sh b/bin/tests/system/additional/clean.sh
index 39423f21b2211e0563e855fae046e91f1b6c60d4..c9c2c9de41ce581a72d564fd12750fc4b0676d7e 100644 (file)
--- a/bin/tests/system/additional/clean.sh
+++ b/bin/tests/system/additional/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in
index 46eb1d0eac3f44b1e188c63d8e01278ebc61922e..9ef818325aac45b5787270bb03578d982eba4b3c 100644 (file)
--- a/bin/tests/system/additional/ns1/named1.conf.in
+++ b/bin/tests/system/additional/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in
index 91b4f60c57800d4b15a000f7e8bd3ac82bb3ddc1..17cc54e574b27bd5eb361b9e92279bc4f50849fe 100644 (file)
--- a/bin/tests/system/additional/ns1/named2.conf.in
+++ b/bin/tests/system/additional/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in
index a0d87d1fb7e23761479c9d1212430aa3a20ef7d5..631b17a865f6a5dbbd2ff9716aea6206b82a31cb 100644 (file)
--- a/bin/tests/system/additional/ns3/named.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh
index e57b17113c19afdcdf6997798c5c4611823b18d9..c88c3b6d3a9e06dac4434275aba6a9fdde08ce44 100644 (file)
--- a/bin/tests/system/additional/setup.sh
+++ b/bin/tests/system/additional/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index abf8f810c52cc6c7de68a0972aaacab609b52af9..6cade6376398164dd39c469b1767d8b0983d13ee 100644 (file)
--- a/bin/tests/system/additional/tests.sh
+++ b/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index 83876aabfbdb69d717656046a94530db70d78b15..4c110db7671f5be48557f0cf57057f97d64069b1 100644 (file)
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2013, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in
index d9bb4d21e9b7ea288d2c7e842a5173f521a127d6..8dbc413fabdbdb6675b3f170040278908390aa13 100644 (file)
--- a/bin/tests/system/addzone/ns1/named.conf.in
+++ b/bin/tests/system/addzone/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named1.conf.in
index 62e65c9d320cf23a7cc54579d610faa29af71929..2489870a9a9cfbe0c255b532bcf84c896dc0a438 100644 (file)
--- a/bin/tests/system/addzone/ns2/named1.conf.in
+++ b/bin/tests/system/addzone/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,8 +19,8 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
-        allow-query { any; };
-        recursion no;
+       allow-query { any; };
+       recursion no;
        allow-new-zones yes;
 };
 

diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.in
index 633db852c861607d6079c580c1408dd138e40ab7..bec7f0ca71d2c87cf3087c6c7605fa058a46d304 100644 (file)
--- a/bin/tests/system/addzone/ns2/named2.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named1.conf.in
index 521b1949c28125d3af8dadc774510332bd2495cd..ba775068e1595551707a9bd04d5fd2604e321e0c 100644 (file)
--- a/bin/tests/system/addzone/ns3/named1.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/ns3/named2.conf.in b/bin/tests/system/addzone/ns3/named2.conf.in
index 1a07111990d92ac4f16fe272d1950384ff44f7b1..39182f251046332a34c49db9ab2fa94b7031c749 100644 (file)
--- a/bin/tests/system/addzone/ns3/named2.conf.in
+++ b/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index 0821945e20b5fca63743db38899f2a67b6706b0e..11789fa1638e1d80a917f3f0ce3212d2176b368a 100644 (file)
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2014, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 2ef6e1b6a5fbf25a48edc4b863ad2d7a1492aa5b..5be9722b59406f90131896452d50370fd4517f62 100755 (executable)
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named02.conf.in b/bin/tests/system/allow_query/ns2/named02.conf.in
index f764415d0788ebd2ac0e84bc54791cd63ead61d2..5863bff347da2ab5cd2a089691a36ac70b8cfca9 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named02.conf.in
+++ b/bin/tests/system/allow_query/ns2/named02.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named04.conf.in b/bin/tests/system/allow_query/ns2/named04.conf.in
index c7ffa8471ce3bc7a8572ef1ed25d04cd25d5e986..64848dc5e98fa71cf70774e85db22ac5b57f01f0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named04.conf.in
+++ b/bin/tests/system/allow_query/ns2/named04.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named06.conf.in b/bin/tests/system/allow_query/ns2/named06.conf.in
index e5b36eba3c2a7618cd6f54317b4eec91ca518794..d5937cdecfe72c2cb726909ef806e10313d14eff 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named06.conf.in
+++ b/bin/tests/system/allow_query/ns2/named06.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named08.conf.in b/bin/tests/system/allow_query/ns2/named08.conf.in
index 79ffebbe5a2fc9dcbc042d7fcf34e23fb7a8c165..6c62fecfe157495995d085858406f3318c97ebaa 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named08.conf.in
+++ b/bin/tests/system/allow_query/ns2/named08.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named10.conf.in b/bin/tests/system/allow_query/ns2/named10.conf.in
index 6c803635617baae24a97af141818aa3a682ad108..f32ccb451c64fa8294f40e97b6009975d8f5f6c6 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named10.conf.in
+++ b/bin/tests/system/allow_query/ns2/named10.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named12.conf.in b/bin/tests/system/allow_query/ns2/named12.conf.in
index 4aa67dae835de496c75c7766b78df0147f11b24f..f7aaec32f42397d58fd58cd2c26f8328e4fd84dc 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named12.conf.in
+++ b/bin/tests/system/allow_query/ns2/named12.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named22.conf.in b/bin/tests/system/allow_query/ns2/named22.conf.in
index 8a61c94b1df1878caee036670a5998d609e8ebf3..aedc1a5a785419f49e7d9593674e2d690d889cab 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named22.conf.in
+++ b/bin/tests/system/allow_query/ns2/named22.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named24.conf.in b/bin/tests/system/allow_query/ns2/named24.conf.in
index 3b54538d21e139e01905774e38b79523913b36bc..3f000e57324f2f920e4879aa34eae2a421f7ec19 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named24.conf.in
+++ b/bin/tests/system/allow_query/ns2/named24.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named26.conf.in b/bin/tests/system/allow_query/ns2/named26.conf.in
index 9ad831f5c37a5f56acfd48b2c82cfd8abab2e7f9..8ce440d58564224eaf0b561071509c01dce3aeee 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named26.conf.in
+++ b/bin/tests/system/allow_query/ns2/named26.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named28.conf.in b/bin/tests/system/allow_query/ns2/named28.conf.in
index b9d7d2bd0ca82aae1c1b7d4bb9c21a712c1ca870..ef490cfac1c38b547e4fdbd95642967b69736c23 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named28.conf.in
+++ b/bin/tests/system/allow_query/ns2/named28.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named30.conf.in b/bin/tests/system/allow_query/ns2/named30.conf.in
index 94ed507ac724358af36bbb718e4f073b63fe731a..148945a45d839a36fa9de72dc2c51b84fe808bbc 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named30.conf.in
+++ b/bin/tests/system/allow_query/ns2/named30.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named32.conf.in b/bin/tests/system/allow_query/ns2/named32.conf.in
index 9d28c73bf3784536d43127e71991246d53049f86..20c5b3c7931ede2bfa50f29ce0860f0c452f0425 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named32.conf.in
+++ b/bin/tests/system/allow_query/ns2/named32.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named34.conf.in b/bin/tests/system/allow_query/ns2/named34.conf.in
index 1a6e6a4af8c5479d0179c6060aa909795f67060f..40b1573e33b93ec8fe683c0f1673ac3f255866d0 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named34.conf.in
+++ b/bin/tests/system/allow_query/ns2/named34.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named53.conf.in b/bin/tests/system/allow_query/ns2/named53.conf.in
index 951b08456c2e8183616f724bce895033dc6b4bcc..65166d114c8df4a59bbd556f08a1368e9396cfef 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named53.conf.in
+++ b/bin/tests/system/allow_query/ns2/named53.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named55.conf.in b/bin/tests/system/allow_query/ns2/named55.conf.in
index 7391dfee297f4e99d00ea427153b5393aa3595ac..0d92cae7787ddfe25f5708cebef051699dd3369d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named55.conf.in
+++ b/bin/tests/system/allow_query/ns2/named55.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/allow_query/ns2/named57.conf.in b/bin/tests/system/allow_query/ns2/named57.conf.in
index 4e1c142c304e8a517f61d670ac382134baa30962..bbc4715cebe26dd606b09218bce2b65219c3b560 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named57.conf.in
+++ b/bin/tests/system/allow_query/ns2/named57.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index 33ad9233230d3e5fc67ce33ee1442c5da4f826f7..cbd2700d148f3b969e4196316ce486d3e9b6f22c 100644 (file)
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2014, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index cb268950ba07b97fd8f589faef8518b2661bb1a6..33c37a5b9c8bcbdcc26f9a03ebea8749cbf05b7c 100644 (file)
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in
index 45f8ddcc9c77d60ac3a2f3f0a16ad999caff142f..3d620cf0d2fc11da15450ac057b3f6f15eec8af2 100644 (file)
--- a/bin/tests/system/autosign/ns1/named.conf.in
+++ b/bin/tests/system/autosign/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -31,8 +31,8 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
@@ -42,10 +42,10 @@ controls {
 zone "." {
        type master;
        file "root.db";
-        allow-transfer { any; };
-        allow-query { any; };
-        allow-update { any; };
-        auto-dnssec maintain;
+       allow-transfer { any; };
+       allow-query { any; };
+       allow-update { any; };
+       auto-dnssec maintain;
 };
 
 include "trusted.conf";

diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index ec095cf3da1dcb39e0383cbb86d2aea5ee525790..bd5a63015edbd6e2ae29d4cf295fe9d73796978b 100644 (file)
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index 698f5887ecbd49f819a739333c47b5e34ce88e59..9bb3e03d8b502309493f63604eaf05117e2c352a 100644 (file)
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2012, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index 524e7f1476cdec31445689a6e60e322d6198f05c..a2d15f880fdb9403c24d5590630515cc054258d5 100644 (file)
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/ns5/named.conf.in b/bin/tests/system/autosign/ns5/named.conf.in
index 203d2a370ac2e1dbc11093bd2eeaa16c324db346..985e48fc02409eb2245828f80989cd3c6bed50f4 100644 (file)
--- a/bin/tests/system/autosign/ns5/named.conf.in
+++ b/bin/tests/system/autosign/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 0e9a96ee529e78b4cb7e5e0d539a021d3447da49..16b655a2be2e3ad9eb70492bb5420ee3c41ffd8c 100644 (file)
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index ca082af277365bb483dff12f8335dd47eae79fb0..d7ff2305f7d74fff6b679444a9ae486419a5bf17 100755 (executable)
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/builtin/clean.sh b/bin/tests/system/builtin/clean.sh
index 7bce09475144514d4bd3b61580272e12a6c3a5eb..373645a383591640276b55922c8ba9c1e59c4e00 100644 (file)
--- a/bin/tests/system/builtin/clean.sh
+++ b/bin/tests/system/builtin/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/builtin/ns1/named.conf.in b/bin/tests/system/builtin/ns1/named.conf.in
index 9a6ed7323dbd81c81c2eed83f9cde90954e8b521..ef818e6b7d368864dd3b42409fba6704f1d9a2e3 100644 (file)
--- a/bin/tests/system/builtin/ns1/named.conf.in
+++ b/bin/tests/system/builtin/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/builtin/ns2/named.conf.in b/bin/tests/system/builtin/ns2/named.conf.in
index 46129f24e49668d0e8f99a1726ad6575bc8f3ee4..ba7b8114be61b33003701e7ccbe08f89f5e603dd 100644 (file)
--- a/bin/tests/system/builtin/ns2/named.conf.in
+++ b/bin/tests/system/builtin/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/builtin/ns3/named.conf.in b/bin/tests/system/builtin/ns3/named.conf.in
index 2b53bdadb25366b48dbdb02a54849493d6e73ab7..0c573c8607ada4a73b9b933cee5fadbb4d726ec4 100644 (file)
--- a/bin/tests/system/builtin/ns3/named.conf.in
+++ b/bin/tests/system/builtin/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/builtin/setup.sh b/bin/tests/system/builtin/setup.sh
index 08a9c49e8caf6df3706fe759dec54c3921f3de69..dc3484f6fb31532b021686f12b839a9ff19eecc7 100644 (file)
--- a/bin/tests/system/builtin/setup.sh
+++ b/bin/tests/system/builtin/setup.sh
@@ -2,9 +2,17 @@
 #
 # 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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index 4d80364cfd246048dd2cfd9f10071f90f605530d..4b7c0f7a28908668bf282c0112bb9277fc000c9d 100644 (file)
--- a/bin/tests/system/builtin/tests.sh
+++ b/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index a8c7c8440087373b49532a355ea71785f57c24e1..7b810a475782fead84343864c16e6e7793db1cca 100644 (file)
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in
index 02cad01d5067805265f55ff77bfc3e0da4a048fb..f74e70a6ad609f54fc47a4f1b4f01f2680dcdc72 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/named.conf.in
+++ b/bin/tests/system/cacheclean/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 775ff6216a9a81efe7664ce98f2f207251a03098..af4a9bd713bff1c97b7b268b32d1b09698486bec 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh
index d4f9dbc3588b6f8a66cbda9f25d97757ec7c651c..4b268ed3158714a0da57b5cd3335a766c3de9388 100644 (file)
--- a/bin/tests/system/cacheclean/setup.sh
+++ b/bin/tests/system/cacheclean/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 3c2b64a7162d02aad796eccb7b2b5b1a7eb055a3..e02389dcc5d2a0ce16822513b6509eeea91ab21d 100755 (executable)
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/chain/ans3/ans.pl b/bin/tests/system/chain/ans3/ans.pl
index 1d5c047f46d72e6472daf210638fbcd8e3d55c7b..ffad72e2efffeb01d9911ddd3809f8529cf4da55 100644 (file)
--- a/bin/tests/system/chain/ans3/ans.pl
+++ b/bin/tests/system/chain/ans3/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/ans4/README.anspy b/bin/tests/system/chain/ans4/README.anspy
index 3688eeb0ed37c32b2e681020c03317a31e3d61e2..316fe900d7bc1a326aea73e3743d26dfb59f029d 100644 (file)
--- a/bin/tests/system/chain/ans4/README.anspy
+++ b/bin/tests/system/chain/ans4/README.anspy
@@ -1,4 +1,4 @@
-Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 REQUIREMENTS

diff --git a/bin/tests/system/chain/ans4/ans.py b/bin/tests/system/chain/ans4/ans.py
index 326134006fc23bde190db63821d76b0ee94f0a88..61aac3360148ff08d4dc53e8a2f8ec727d131046 100755 (executable)
--- a/bin/tests/system/chain/ans4/ans.py
+++ b/bin/tests/system/chain/ans4/ans.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/clean.sh b/bin/tests/system/chain/clean.sh
index f0030d9c45eacaf07c90637d24e7af6d5d2b8472..44d4f472539eeaaf927bb42a918309d3f0cea528 100755 (executable)
--- a/bin/tests/system/chain/clean.sh
+++ b/bin/tests/system/chain/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in
index c8b64d424c85a2a4dc1d87ae7859749191582b77..6153bd1ecd6684cc5142eb86bee3175cb41071fe 100644 (file)
--- a/bin/tests/system/chain/ns1/named.conf.in
+++ b/bin/tests/system/chain/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/ns2/named.conf.in b/bin/tests/system/chain/ns2/named.conf.in
index 977a1bde2184c6ca9f271783c19fc777fd79733a..085934e41a21277169608ab2ce002db9cc3d50ae 100644 (file)
--- a/bin/tests/system/chain/ns2/named.conf.in
+++ b/bin/tests/system/chain/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in
index aaf57a19d47e9081e8725dfddbda915335c33aff..eb58a36867be850cbb6349b8ffd0b155ac2d4c3b 100644 (file)
--- a/bin/tests/system/chain/ns5/named.conf.in
+++ b/bin/tests/system/chain/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in
index a57885227c1aec74cb930347f8794eefb65354be..dbf60ea65f966c9919a65ce5e97d24a2dee6b8d0 100644 (file)
--- a/bin/tests/system/chain/ns7/named.conf.in
+++ b/bin/tests/system/chain/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh
index b4e3aad11d9909a9f763e348d35c7f36e3b154fa..a92eb8a83cd9e03cd701282d7574f93e55bbc548 100644 (file)
--- a/bin/tests/system/chain/prereq.sh
+++ b/bin/tests/system/chain/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index 70180ce3dc473eca4fdcd82c1766ddb3be9a5160..730343574d99e8c2440e5476010e64895d1fa828 100644 (file)
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index 98362dc088c6a03df8645f5718e8eecbb54aabff..18e306bc8c1c2d211e1f7af67029fa4920bebbf6 100644 (file)
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checkds/tests.sh b/bin/tests/system/checkds/tests.sh
index 41e55cd5fceec8502b753592110a908c655f8a3a..56255cceb3c0c9eb99fb14e884d1db88ff4fc606 100644 (file)
--- a/bin/tests/system/checkds/tests.sh
+++ b/bin/tests/system/checkds/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index 52ef25ca64213af3cc4e0c9bbf47902228b3f177..0a1c16b406f06dfe2f77e23fc9748662c626c747 100644 (file)
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.in
index d9ce15ddd263f179b86065f6dc2fc81e56d9431c..c81d5705fe7a0d9783f55b4320cd0556ee4dd325 100644 (file)
--- a/bin/tests/system/checknames/ns1/named.conf.in
+++ b/bin/tests/system/checknames/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.in
index 4aee139ec7ee3d6afdb33ed06d7412f48f2aba3c..e3d6e9c2ba712185be19a428938df94769305b89 100644 (file)
--- a/bin/tests/system/checknames/ns2/named.conf.in
+++ b/bin/tests/system/checknames/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +25,7 @@ options {
        recursion yes;
        acache-enable yes;
        check-names response warn;
-        notify yes;
+       notify yes;
 };
 
 zone "." {

diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.in
index 23a96075eeb34df12bf3a382ec30803ceddea232..aa265ea647b432c666ace1fc94b0fedee3183cb6 100644 (file)
--- a/bin/tests/system/checknames/ns3/named.conf.in
+++ b/bin/tests/system/checknames/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +25,7 @@ options {
        recursion yes;
        acache-enable yes;
        check-names response fail;
-        notify yes;
+       notify yes;
 };
 
 zone "." {

diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in
index 68e1384bb2dea4035760c3555cefeb7b84a8ea0c..147df7c98294e9295a6b78207aea310247e75258 100644 (file)
--- a/bin/tests/system/checknames/ns4/named.conf.in
+++ b/bin/tests/system/checknames/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
index 61f65546c57efafbbba68d95e88d05fa44b25a0c..d13d2746c1f922beb8d9e6d722a661dbd43829b2 100644 (file)
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh
index 1717616dd2d26b1ba8e7340da33f5685ac8c0bc6..f930c9e3991667730e5f2ef01052394211487100 100644 (file)
--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index 147ccb53c6d4e3838f81e104d1bd7df57bda8f31..de57032a407b20dec0371e7d4d9121638b7fcae4 100644 (file)
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index e6a55ac994573bb1e3e489ac2918f54fb4b00cb4..126485ab6f96b8cdedf8fa32ed44e6c0cc696f4f 100644 (file)
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
index 6fcb5e5d171e52f41ca2d2f453b1a42fc339bf69..ee4caeaab00c49b9f57f37da16ce5c5a9f711a65 100644 (file)
--- a/bin/tests/system/common/controls.conf
+++ b/bin/tests/system/common/controls.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,11 +16,11 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
-        inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; };
 };
 

diff --git a/bin/tests/system/common/controls.conf.in b/bin/tests/system/common/controls.conf.in
index d1bf5b5271d9b448b52d961834d1a7cedf7d37d5..7a0cba99ada2652e5a270c0902c3cef532756b88 100644 (file)
--- a/bin/tests/system/common/controls.conf.in
+++ b/bin/tests/system/common/controls.conf.in
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +16,7 @@
 
 key rndc_key {
        secret "1234abcd8765";
-        algorithm hmac-md5;
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index b67680c98fecb3e1db868342a761fe1022ee5dc2..6c34e2d2e86b4e2c11ac52a94958f684795cb0b0 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/coverage/prereq.sh b/bin/tests/system/coverage/prereq.sh
index 5f298e28c84b4349aab60d870be4cdb3e05d81e2..a8efab2384f13e6ef3285e274c67ac78cf5bb783 100644 (file)
--- a/bin/tests/system/coverage/prereq.sh
+++ b/bin/tests/system/coverage/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/coverage/tests.sh b/bin/tests/system/coverage/tests.sh
index 5e151b014590e58e36d431b68114fed54462deea..32370fbc17d979781de4b719870670ee89ae30ed 100644 (file)
--- a/bin/tests/system/coverage/tests.sh
+++ b/bin/tests/system/coverage/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index 96cb76143a29c38fbe6e833a75d8f4f57220834b..329abf670e81e3bb5eda59f8f9f8e644c29d0b11 100644 (file)
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index 09b17b6249e0055d1013899ea3003c682f8e3eb0..f432926f7aaebe47f2d7fa6250d6926d7d354c39 100644 (file)
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,8 +17,8 @@
 // NS1
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 56b568143bed92ed2175e9352a585c159d7076c6..7b4f18a1f89cc8d429ef1c7e2b7e564c9db57e22 100644 (file)
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,8 +17,8 @@
 // NS1
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index 8cf4bbdd5f41bc1a594271d9504d46d9cd09bb0f..c8735cf4eab5c94f55c3fe3cd62123426341b9bd 100644 (file)
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 46afe69682e96825013d7fa691701e00f9c7818a..f6c6d8af189a985cfff5a5fd6d98efc77611d921 100644 (file)
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index 820320a1973b101d2809b8c60fdbc2cee8dd8850..df04d29097702f66c96d4c82cc017779aa985bfd 100644 (file)
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/digdelv/ns1/named.conf.in b/bin/tests/system/digdelv/ns1/named.conf.in
index 44a1be3cf6057968a360ebecb4094f1362978cf7..e239d00e4b27460951987e0fd3a1f2cf3a09f62a 100644 (file)
--- a/bin/tests/system/digdelv/ns1/named.conf.in
+++ b/bin/tests/system/digdelv/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index 53da3a1aee1087e4fdfcbea90833ef0411758e99..58ed223860d2d703c2748fb7b531e4e9b9c9638f 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index 410086be80fc82192fa9dcbf8b674caa36ccc90c..8a869cb4167132d801202240cea97e0aae703f71 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index e877403d82d5c624cbba35a7df5df8f446089a2d..dc3484f6fb31532b021686f12b839a9ff19eecc7 100644 (file)
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index c5bec6454d630f5cbd81dacab0090b79c345824f..3042a3933dd0a6ba939d5330a8666f288e7f3eb1 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh
index 9de49b99f3252f1fe082a110fc556ea2af012409..4658987b4b4e4d00147a63246898beb2d8067591 100644 (file)
--- a/bin/tests/system/dlv/clean.sh
+++ b/bin/tests/system/dlv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010-2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns1/named.conf.in b/bin/tests/system/dlv/ns1/named.conf.in
index c8a970e885c8e04cc8ea0ce00a0761f9c47c8af4..b9f6bd6f81dc31433792fc6cadaee12c887f9b26 100644 (file)
--- a/bin/tests/system/dlv/ns1/named.conf.in
+++ b/bin/tests/system/dlv/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns1/root.db.in b/bin/tests/system/dlv/ns1/root.db.in
index fbfefe7baa567a9356c5509c449e2ddab80283b5..167d0c7bd54b8e061de2a2f62840b6bee719eaa0 100644 (file)
--- a/bin/tests/system/dlv/ns1/root.db.in
+++ b/bin/tests/system/dlv/ns1/root.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db
index 865e09cda14cd2e3be9a129154fa65da09544dea..3fbe15a9b3b7e7dde9a60efe978145e8cece198f 100644 (file)
--- a/bin/tests/system/dlv/ns1/rootservers.utld.db
+++ b/bin/tests/system/dlv/ns1/rootservers.utld.db
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index b3f09b81ea3bd2b095467927ad521600ac3130d2..d664107eef7b39a01ec33cb6cb6f31f0a11a9ad8 100755 (executable)
--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns2/druz.db.in b/bin/tests/system/dlv/ns2/druz.db.in
index 3ec5f16e44dd19c182eed374814e81374a99e623..54efaae099fc9832a06816e9c899841198c2406e 100644 (file)
--- a/bin/tests/system/dlv/ns2/druz.db.in
+++ b/bin/tests/system/dlv/ns2/druz.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints
index bafa85a283b68dd022b483f3b1dbb25982eef1b2..0b90a442574ee23aca58051f9386d121c40ff83b 100644 (file)
--- a/bin/tests/system/dlv/ns2/hints
+++ b/bin/tests/system/dlv/ns2/hints
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns2/named.conf.in b/bin/tests/system/dlv/ns2/named.conf.in
index b0429b1fe2fb5d9e2553f9efc0a57bb898d0be35..9d4902a8f0da7f266c6d6edecfb8afdcce6342ee 100644 (file)
--- a/bin/tests/system/dlv/ns2/named.conf.in
+++ b/bin/tests/system/dlv/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
index 482aeadc603dcb5aa847dbb386810a73115c6f13..d325a64ca42e761d814bc94c19fff32045ee5df5 100755 (executable)
--- a/bin/tests/system/dlv/ns2/sign.sh
+++ b/bin/tests/system/dlv/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db
index 8acfc3ae02c9e511008ef2a5f27ecea79de15678..df9b61a52c9c26979d01f9cf318e368b1faec476 100644 (file)
--- a/bin/tests/system/dlv/ns2/utld.db
+++ b/bin/tests/system/dlv/ns2/utld.db
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in
index 93b2e2ce1b9f29b8e6f64090b7b0f9abf23ae7e7..fbb87e97d8a042bc5764658760c8b4233e963d7c 100644 (file)
--- a/bin/tests/system/dlv/ns3/child.db.in
+++ b/bin/tests/system/dlv/ns3/child.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in
index deff571a7ad921172d74e1f90d482cb0b3f4b301..3eb2adabcf953a4b7229f20027be76f0b9cbfc65 100644 (file)
--- a/bin/tests/system/dlv/ns3/dlv.db.in
+++ b/bin/tests/system/dlv/ns3/dlv.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints
index bafa85a283b68dd022b483f3b1dbb25982eef1b2..0b90a442574ee23aca58051f9386d121c40ff83b 100644 (file)
--- a/bin/tests/system/dlv/ns3/hints
+++ b/bin/tests/system/dlv/ns3/hints
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns3/named.conf.in b/bin/tests/system/dlv/ns3/named.conf.in
index df23c6d99c6d78ba687a5dc360109796fdf9ed86..7f0822589b3ea3f7e75884100252b6b34d04e2f6 100644 (file)
--- a/bin/tests/system/dlv/ns3/named.conf.in
+++ b/bin/tests/system/dlv/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index fb104cf8ecdd3353d1e83478fbe8fd257bdd695a..21391ef7680a71cf4a4d828f1ffa2360eb4538bd 100755 (executable)
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db
index 94b005e1689ede0b7b9b83d1ee31ac6205e422e2..b8de9b5e7830bfd20c9a758fd51b503bd768c5be 100644 (file)
--- a/bin/tests/system/dlv/ns4/child.db
+++ b/bin/tests/system/dlv/ns4/child.db
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints
index bafa85a283b68dd022b483f3b1dbb25982eef1b2..0b90a442574ee23aca58051f9386d121c40ff83b 100644 (file)
--- a/bin/tests/system/dlv/ns4/hints
+++ b/bin/tests/system/dlv/ns4/hints
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns4/named.conf.in b/bin/tests/system/dlv/ns4/named.conf.in
index bd2ac8720879ddc648d22ed5cb5c5cbc0afd2a3b..df11059bd17f31b3654fc82866594b50aa772dfb 100644 (file)
--- a/bin/tests/system/dlv/ns4/named.conf.in
+++ b/bin/tests/system/dlv/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints
index bafa85a283b68dd022b483f3b1dbb25982eef1b2..0b90a442574ee23aca58051f9386d121c40ff83b 100644 (file)
--- a/bin/tests/system/dlv/ns5/hints
+++ b/bin/tests/system/dlv/ns5/hints
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns5/named.conf.in b/bin/tests/system/dlv/ns5/named.conf.in
index a930abaa3e941e5f336e0475c643e45eefd04723..dad7a04247e5556fbdcfad1585f0bdf246f2f9f5 100644 (file)
--- a/bin/tests/system/dlv/ns5/named.conf.in
+++ b/bin/tests/system/dlv/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf
index f401fda1b88f334fd2064921033478725f4d4081..0293e5886df0c088a4e10f08ea4fea92d8381c88 100644 (file)
--- a/bin/tests/system/dlv/ns5/rndc.conf
+++ b/bin/tests/system/dlv/ns5/rndc.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns6/child.db.in b/bin/tests/system/dlv/ns6/child.db.in
index a9fbcc4545c186a5c0bdb31257a3976d6b759763..f1b62977c1892fc0c905606dd921f669fe245a0d 100644 (file)
--- a/bin/tests/system/dlv/ns6/child.db.in
+++ b/bin/tests/system/dlv/ns6/child.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns6/hints b/bin/tests/system/dlv/ns6/hints
index bafa85a283b68dd022b483f3b1dbb25982eef1b2..919e0ff6d0b5d919a957b8ef4a8f15a9643fcf30 100644 (file)
--- a/bin/tests/system/dlv/ns6/hints
+++ b/bin/tests/system/dlv/ns6/hints
@@ -1,4 +1,4 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns6/named.conf.in b/bin/tests/system/dlv/ns6/named.conf.in
index 82bc51ce20d84df9ede25150368ccefa27cea416..c4c410333711b8c686a49f08b627aadf232a7bc1 100644 (file)
--- a/bin/tests/system/dlv/ns6/named.conf.in
+++ b/bin/tests/system/dlv/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh
index a517a66ea03e5bac027f63d9d1c58b71127a9568..79d3faff50390783aac7759165eeef8d41b1f20b 100755 (executable)
--- a/bin/tests/system/dlv/ns6/sign.sh
+++ b/bin/tests/system/dlv/ns6/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/prereq.sh b/bin/tests/system/dlv/prereq.sh
index 5f298e28c84b4349aab60d870be4cdb3e05d81e2..a8efab2384f13e6ef3285e274c67ac78cf5bb783 100644 (file)
--- a/bin/tests/system/dlv/prereq.sh
+++ b/bin/tests/system/dlv/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index ef6141fa3e3ebc1b74b80e81eb51676cac1b9bbc..127dd6930ade89f3c6bd2cf83fb08eb0a9a2c7eb 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index 9b21a5674ce44492c627d7159409506e8a67a0d5..58abb58f797e390b53aa0d4957bca2047bde8f74 100644 (file)
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010-2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlz/clean.sh b/bin/tests/system/dlz/clean.sh
index 5e2783dbd0cf4d1d934805d96199e1fcb2e2bdb3..b0ce19399e674f126b1b31a34a9cb3c51836bd23 100644 (file)
--- a/bin/tests/system/dlz/clean.sh
+++ b/bin/tests/system/dlz/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlz/ns1/named.conf.in b/bin/tests/system/dlz/ns1/named.conf.in
index e4efc776ac622da4609eff0a0dd07f41da8aa082..33853a9d98e43e4587aed435d98ef5db33f422e3 100644 (file)
--- a/bin/tests/system/dlz/ns1/named.conf.in
+++ b/bin/tests/system/dlz/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh.in
index fbf3a3e510e14b1f9add27aef3726fe2a0091665..61a803fe050eb4df89481c51eff23070f5c69a2e 100644 (file)
--- a/bin/tests/system/dlz/prereq.sh.in
+++ b/bin/tests/system/dlz/prereq.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlz/setup.sh b/bin/tests/system/dlz/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/dlz/setup.sh
+++ b/bin/tests/system/dlz/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dlz/tests.sh b/bin/tests/system/dlz/tests.sh
index 79827ce82137e790d05a093947502701656c654c..62d99ee03b5e321fd1bb2226399377e61c0c11b6 100644 (file)
--- a/bin/tests/system/dlz/tests.sh
+++ b/bin/tests/system/dlz/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
index 2d9455613d5aefec413b3092f3a754d3cc5df454..336650d42e9d470a157043164f177b36b91452c0 100644 (file)
--- a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011-2014, 2016  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
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 dlz "example zone" {

diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index 28a94e65607cb81c996247f84d56f2f3df65895d..aca9df58eb30b556a8014c3cd7780eb468c41cab 100644 (file)
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlzexternal/prereq.sh b/bin/tests/system/dlzexternal/prereq.sh
index fbe133444c019812c96f748ad3223a38462e17e9..0c8219bf8ffa612cd3d1fd27743188fba3c9dc57 100644 (file)
--- a/bin/tests/system/dlzexternal/prereq.sh
+++ b/bin/tests/system/dlzexternal/prereq.sh
@@ -1,6 +1,6 @@
 #!/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 4c940c2bae8c2fd7691c6bd8f7f17b3a7a2e6d45..ad5e625012eb5d944331352a429ad0bbeb27a0a7 100644 (file)
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh
index 2969f70fbe5c3400fda2320fa58fcbcb1feec262..52894557f375c92c7aa444c6de4fc7bcf85f0adc 100644 (file)
--- a/bin/tests/system/dns64/clean.sh
+++ b/bin/tests/system/dns64/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dns64/ns1/named.conf.in b/bin/tests/system/dns64/ns1/named.conf.in
index a0dd62c01d6f067fb08baf70e517b1d651cd9ce6..6409026086a950e2beef412edf5618046b7fa53f 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf.in
+++ b/bin/tests/system/dns64/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -32,12 +32,12 @@ options {
        dnssec-validation yes;
 
        dns64 2001:bbbb::/96 {
-                clients { any; };
-                mapped { !rfc1918; any; };
-                exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; };
-                suffix ::;
+               clients { any; };
+               mapped { !rfc1918; any; };
+               exclude { 2001:eeee::/32; 64:FF9B::/96; ::ffff:0000:0000/96; };
+               suffix ::;
                recursive-only yes;
-        };
+       };
 };
 
 zone "." {

diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 5f430592fcd758652a6fdd81fe006ece2e09ef39..b02f21e6357933050246af8043e762c78c305269 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index 273dce290eb2a7b117d70003fb13aa256f7a98da..e607b24df2997aa0dcc4ff7e52670f5325975c3d 100644 (file)
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index d4f965501de65dd1e84998755d9ef72e2c3cce13..4d37e02c0d98df86b6d99fad781d555273fd1481 100644 (file)
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 3a035f85ccf5025a4fe4e1ef9485b51b67063ce7..cb56595fa2f4b9da248ce2fa8af6766cbd1caf74 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl
index 57c491eb64208b50d9c07ac56a3292953cf48c2f..11d50b87e7b190c740670cd489fe6b2a85345f78 100644 (file)
--- a/bin/tests/system/dnssec/dnssec_update_test.pl
+++ b/bin/tests/system/dnssec/dnssec_update_test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index cd2b1c82f6660a8be43658cf774334c079f59c0d..812119388c25d0220ebc60d8ecc9f1a8d12870ab 100644 (file)
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index e9499d9b32c1614ef5a18f9550b3cac313945539..6cea19346b643469a9f4c9f183618c717539bc27 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008, 2010, 2011, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008, 2010, 2011, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index 48131615e43a1086915f35b6cd3fc85fc415a271..c841d817f25ce7846cd473dd7bddf36d3498be0f 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index ad4f79c99e99631571676eb6af9fb9f1b896b2f5..4043852fb4b72986952ae78dc3ee9d6e92f41292 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,17 +30,17 @@ options {
        dnssec-validation yes;
        dnssec-must-be-secure mustbesecure.example yes;
 
-        # Note: We only reference the bind.keys file here to confirm that it
-        # is *not* being used.  It contains the real root key, and we're
-        # using a local toy root zone for the tests, so it wouldn't work.
-        # But since dnssec-validation is set to "yes" not "auto", that
-        # won't matter.
-        bindkeys-file "../../../../../bind.keys";
+       # Note: We only reference the bind.keys file here to confirm that it
+       # is *not* being used.  It contains the real root key, and we're
+       # using a local toy root zone for the tests, so it wouldn't work.
+       # But since dnssec-validation is set to "yes" not "auto", that
+       # won't matter.
+       bindkeys-file "../../../../../bind.keys";
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index c336280fc6e53561bd860e45662388fba77c78a8..78e98b2a32ffc0828d56541dfe50a8938c0d3d81 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,12 +28,12 @@ options {
        acache-enable yes;
        dnssec-enable yes;
        dnssec-validation auto;
-        bindkeys-file "managed.conf";
+       bindkeys-file "managed.conf";
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index 6eb9004382fa8fe6b8c73ee1f802d39e96344696..0671e12458f048cbd382fce7e990a61da368cd9e 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,13 +28,13 @@ options {
        acache-enable yes;
        dnssec-enable yes;
        dnssec-validation auto;
-        bindkeys-file "managed.conf";
-        dnssec-accept-expired yes;
+       bindkeys-file "managed.conf";
+       dnssec-accept-expired yes;
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {

diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in
index b928c80f2c243a5022066a8a328aab5f5738cc7a..7b051c05ec14eac2a0a7f086cb99c5100b1cdd70 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named4.conf.in
+++ b/bin/tests/system/dnssec/ns4/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dnssec/ns4/named5.conf.in b/bin/tests/system/dnssec/ns4/named5.conf.in
index 64a2732549617c4c3174e1427308dbf7acff2d64..33c0157ade85d90fc9f541133e58bbccf6e0e084 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named5.conf.in
+++ b/bin/tests/system/dnssec/ns4/named5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index 80dda22d042f8d6fe461753caa19774059eadc7a..9b7989ac78ecf8f479817332448319510865cf0d 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in
index 7b5f7551d5ae85a325401ee719d592d763690be0..5063ccf309cad37de522541d4ef4c7e369e19e1a 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named2.conf.in
+++ b/bin/tests/system/dnssec/ns5/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index 6a14f6024ed17e0f1a5e4734f9c776ceb54a8db1..dccce5da1ab748bf76f9a06255a95cecfb5cb4dd 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index d2def9fcadab5e6c9112df32d58a25f398fb2f6c..a8dcaebd79a6345eef65b6fc25294343d3413f47 100644 (file)
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008, 2010, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008, 2010, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index 01ecf97b96e65ed0d5dbef10fec4ccad77ff7432..279fbdf5bc8c666577bc29a119809f56793f8529 100644 (file)
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007, 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006, 2007, 2009, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 7cf977fe8083b8fbad1db427d9c7a5c91fbc4dcb..a7daf016b929d9ea19e0bfb93691949a9601d729 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index c87c862e769c8a3feeeddacfcfdd6d3991cbf6cb..16ddc5cc97c637d765a4f6c09cca8f0d69b7cb09 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/emptyzones/ns1/named1.conf.in b/bin/tests/system/emptyzones/ns1/named1.conf.in
index 3b44ed8193ee3ac2d0e6663216bba5095a4caaa2..5435b6d897f522bad7d6266b5be69ed79b79ce21 100644 (file)
--- a/bin/tests/system/emptyzones/ns1/named1.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in
index 243f6bd711b206f8148a8d5e251c6a74fc51108e..f86ab90df78bdd2f9ba8117e13b0e97e77298303 100644 (file)
--- a/bin/tests/system/emptyzones/ns1/named2.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh
index e3b10f128e2ad4c12fcee7a6a88e038f144cb994..6fded9dd1c09af4f90a38101dd481a56bf153db8 100644 (file)
--- a/bin/tests/system/emptyzones/setup.sh
+++ b/bin/tests/system/emptyzones/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh
index 7d846ba16d5ce06aebaf094431c22b49c9c974ee..b28a9f045d2469b953dd76ac6425e35e7cac95d3 100644 (file)
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ans4/ans.pl b/bin/tests/system/fetchlimit/ans4/ans.pl
index ab9b40ff3bbc52fa9bf34839e107c2d64f134188..ba7819cc68f89396ed4d84c00bbdf05b5e3d85bd 100644 (file)
--- a/bin/tests/system/fetchlimit/ans4/ans.pl
+++ b/bin/tests/system/fetchlimit/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh
index 2a7c925a9c9453d5aebd3a4c131f24b1e89c0bee..b8163f8341ba7163ef492041827d887eefb8a601 100644 (file)
--- a/bin/tests/system/fetchlimit/clean.sh
+++ b/bin/tests/system/fetchlimit/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.in
index be8d3ed629e26545bed77115e1cba57cdb2d064a..7e4053493bfca0687265076e356f37252220c8f8 100644 (file)
--- a/bin/tests/system/fetchlimit/ns1/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in
index f05b5367669b70300120973f84cc61583d92944e..5051a10437a0eece814ede736587e3eb8adb693f 100644 (file)
--- a/bin/tests/system/fetchlimit/ns2/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index 773170ba48a84983206773ef84fb38ac83ce99b3..2f96aa40617f78ccf521d4dd170c9349c3acd94b 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
index 38ea7f9f5fdd03fbcac9b9568717be1ea584f317..0c460fe7c5e9ffd97c92dfb06f8e001f37b9f161 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
index 5a101e16dd57f18669d239fb8f5bab47223a5c28..3c568635b8c5f4c67af608f4ebec7826f34b36c5 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh
index 328e00d721d22dc3232ba7db9f81117576eaddd7..505a2ba7d25733c048fd4b95ac8721257a6b926d 100644 (file)
--- a/bin/tests/system/fetchlimit/setup.sh
+++ b/bin/tests/system/fetchlimit/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index 700c6a6f9ccb3d9ba31808a80e3ceae721dcdf10..724149f66a0e7cf81c9a33c9befb9ab58cb76a15 100644 (file)
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh
index ce97a36364e20b8371f053ea0cb08e603391706f..7d69161dab569f12d7c21d459c77c3c865df267f 100644 (file)
--- a/bin/tests/system/filter-aaaa/clean.sh
+++ b/bin/tests/system/filter-aaaa/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns1/named.conf.in b/bin/tests/system/filter-aaaa/ns1/named.conf.in
index 1725b3dc4b83a39c4181c3e364794034631829f0..00790d716629dfd595db0733a81aacba4160fefe 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns1/named.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh
index cf30893f71bbd5a406e06c5527b353730ec2f30d..67a5e3527fffcda67761653894c9ffa2b2aae996 100755 (executable)
--- a/bin/tests/system/filter-aaaa/ns1/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns2/named.conf.in b/bin/tests/system/filter-aaaa/ns2/named.conf.in
index 976481e442bf96f596ab6a47b1e222d525856362..6d701fb1a16935679e7b2c46ec665ab7085d8bac 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns2/named.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns3/named.conf.in b/bin/tests/system/filter-aaaa/ns3/named.conf.in
index c00631da89e0083f1ee4864f97de574bb733c2ba..456db05838ca40573ee4d372ff272844c9aee580 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns3/named.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns4/named.conf.in b/bin/tests/system/filter-aaaa/ns4/named.conf.in
index c5bafab43da2bf3b5e5783a619b077074da65e3d..ca21346322534529eeb05d4bb0f3af2c3361c8b1 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns4/named.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh
index cf30893f71bbd5a406e06c5527b353730ec2f30d..67a5e3527fffcda67761653894c9ffa2b2aae996 100755 (executable)
--- a/bin/tests/system/filter-aaaa/ns4/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns4/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 1d9b15eadbbff2f5624cb6b908abf7e88f0b3714..230f257015b1b07369bc3420561cd848739def49 100644 (file)
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh
index 337da40c47cddb9d7cf5d6422033c58dfbd749fd..66aacd9cb15b293a2cdf70a64cf5fe996feff45d 100644 (file)
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh
index 5fb753484e9e11690aeddaa5d531bc893d77e781..15e0d1426a59e9b317058c8f8885ed598cf9efc5 100644 (file)
--- a/bin/tests/system/formerr/clean.sh
+++ b/bin/tests/system/formerr/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/formerr/ns1/named.conf.in b/bin/tests/system/formerr/ns1/named.conf.in
index a9a5b1c4bf7f3c53267f5ad3360250951cd34cbc..bd555d540b329e2f922ca521f311de5352031b7d 100644 (file)
--- a/bin/tests/system/formerr/ns1/named.conf.in
+++ b/bin/tests/system/formerr/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/formerr/setup.sh
+++ b/bin/tests/system/formerr/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh
index 4ef47ec38f4def5f057a9107968c1544721123bc..717f69add8f484c2be1d26040d263d52408f3d46 100644 (file)
--- a/bin/tests/system/formerr/tests.sh
+++ b/bin/tests/system/formerr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 31389d522f1a54b0b04b0a5af15f804c56b92dc2..c13143c3ef241a589af74d699f0447a7f510fc08 100644 (file)
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 71c059f62a81155c623d27bd09941d2b4a78df19..b41340e7279f07303290f19fb279137f61b4ef50 100644 (file)
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index d9489c2fa98d9b577eca1f4106f662905fe354a4..1251509de517b5857e9254e0d53b99608d5e2773 100644 (file)
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/forward/ns3/named.conf.in b/bin/tests/system/forward/ns3/named.conf.in
index c9e93c5bfd4c09a6186b6bf0842dda0379c11bcd..dc57f333f5758a34973f9e58b96064dc80bb9ed8 100644 (file)
--- a/bin/tests/system/forward/ns3/named.conf.in
+++ b/bin/tests/system/forward/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index 8e335cb94ae6a77208263a32d169be3b2846799c..e6222af7cb3120623e7d4e2b5bb2d43aad9c2f92 100644 (file)
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in
index 6d7aa41dcf150bbe0fa45da6b9f8ad8f7dd38088..e67a468c7641c70b873b550c696b2ba148bec336 100644 (file)
--- a/bin/tests/system/forward/ns5/named.conf.in
+++ b/bin/tests/system/forward/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh
index 01a86be617a1d20f676b076d9208e64ce0b457a3..9f5bee03a4dee5805a955579f56628823929c5c8 100644 (file)
--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index 87fb5eeea6475b23d299827441d8906c487178dc..166c9770c1eb2bc2dc85a5ca2fcb8bcdcc090266 100644 (file)
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 4b235af3c0b92a8bdcda58bfbd8b1a5cd43756ac..083a8ab4c22f557eb79f4569bd31bd55f370d961 100644 (file)
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index d4fde30a208230d9009a9d7fa46b7328d0664ae0..cf6178f33203c8cad27f05b08213a51d0b543eed 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 6b81131ea15ec6edd26bb8ccbc7d500d456f4406..fbc274b5eed87eb16d77a41de86df6e52be39234 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 162bd6e8791d2fb561e343a43abc58272a88f4b9..3470ce19dda97fecc262ac5e920cb0e7f106c0be 100644 (file)
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh
index 4b218c65b9d01a5aa915ba75d1856434fc0cc981..0ab2d7ee1f9e840645ac1244e29c823f42b21d4d 100644 (file)
--- a/bin/tests/system/inline/clean.sh
+++ b/bin/tests/system/inline/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.in
index 21ca9f9550ffb97e1c095edaa0bae963b0efbf32..7e6858149bb2da5c33cb0853dfc3fc72c05c6f3b 100644 (file)
--- a/bin/tests/system/inline/ns1/named.conf.in
+++ b/bin/tests/system/inline/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.in
index a2aedcbd5f1b425bc84ac65fbc831fa9c7e1a968..f3d73ff1c8fede5f3edbcd27efc934045c188544 100644 (file)
--- a/bin/tests/system/inline/ns2/named.conf.in
+++ b/bin/tests/system/inline/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2014, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.in
index 7d6359b6a27ce964809df214995afc5d60a846eb..0e1a3501fb103a037b09177f120aa708b123df55 100644 (file)
--- a/bin/tests/system/inline/ns3/named.conf.in
+++ b/bin/tests/system/inline/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns4/named.conf.in b/bin/tests/system/inline/ns4/named.conf.in
index 8b1816e0787f36943e0593dd5f2d64937cbe2664..87311124e9375c5b1c38250bb5c38cede14c5c96 100644 (file)
--- a/bin/tests/system/inline/ns4/named.conf.in
+++ b/bin/tests/system/inline/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index fc7cfbc6029f7a67f3b58c16a2796af88fa1f938..ab51f0dc670f0a84ce14311ef2a504c97ca1ddf0 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.pre
index 59720d6b59fad4bab542740fb2a93271296393c2..8ec684513ad33241fc85f6501f3e166119968c8c 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.pre
+++ b/bin/tests/system/inline/ns5/named.conf.pre
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns6/named.conf.in b/bin/tests/system/inline/ns6/named.conf.in
index 6e2bcf190587bec1788f248c02d47e892201d71b..8b2c25a646397687893af95b3c834d203d26fb09 100644 (file)
--- a/bin/tests/system/inline/ns6/named.conf.in
+++ b/bin/tests/system/inline/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/ns7/named.conf.in b/bin/tests/system/inline/ns7/named.conf.in
index 9f25b363f03fc6e65476931e25a2d8e574aae743..e166a15e062e77910aeed05e602922b2527684ec 100644 (file)
--- a/bin/tests/system/inline/ns7/named.conf.in
+++ b/bin/tests/system/inline/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index 70a4bd929020f5bc6844800de16c290065c5c2fc..1d60fc83a5603722924516252a546e5957e4bec6 100644 (file)
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index 2ef871071b2bd6e1b72bc01a9066a697e76cdb15..ca1121f5c8ef44842da5b1aa655fbde9b9176363 100755 (executable)
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/integrity/clean.sh b/bin/tests/system/integrity/clean.sh
index 1920a91a12e25d513e30c82c2728ecb7a88e43a3..648274085966fa372de2ae5dbe6547e1f12fa955 100644 (file)
--- a/bin/tests/system/integrity/clean.sh
+++ b/bin/tests/system/integrity/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.in
index eda290d1c69817e4a02a060ce25fbc9ed6b63643..e23278d29ba48904691189d01bc9f1f71ef6bfcd 100644 (file)
--- a/bin/tests/system/integrity/ns1/named.conf.in
+++ b/bin/tests/system/integrity/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/integrity/setup.sh
+++ b/bin/tests/system/integrity/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/integrity/tests.sh b/bin/tests/system/integrity/tests.sh
index 0f1f29c4c6971d6821d1c47e3514203577447de0..76371bf359e25b878e90e310b6fb470bd188f234 100644 (file)
--- a/bin/tests/system/integrity/tests.sh
+++ b/bin/tests/system/integrity/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index c4bb2b5a7545154604d1cd716a51ca3be7de6ec1..43ff810cbb3c95ad3bd598f9a0cdf6b4a3eec201 100644 (file)
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/ixfr/ns3/named.conf.in b/bin/tests/system/ixfr/ns3/named.conf.in
index e497b41d69468aa31cc7ea7c6cf7f3f1cd7d8975..56d5824f711d645bfe17da5b1ea7cf81b101c3ff 100644 (file)
--- a/bin/tests/system/ixfr/ns3/named.conf.in
+++ b/bin/tests/system/ixfr/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/ixfr/ns4/named.conf.in b/bin/tests/system/ixfr/ns4/named.conf.in
index 05ed3fa128f46271bd668c118a39649eb21826cd..d733c3b3ddc97e076d879e69e134428021ec3380 100644 (file)
--- a/bin/tests/system/ixfr/ns4/named.conf.in
+++ b/bin/tests/system/ixfr/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,8 +27,8 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
@@ -36,17 +36,17 @@ controls {
 };
 
 view "primary" {
-        ixfr-from-differences yes;
+       ixfr-from-differences yes;
        request-ixfr yes;
-        zone "test" IN {
-                type slave;
-                file "mytest.db";
-               masters { 10.53.0.3; };
-        };
-        zone "sub.test" IN {
-                type slave;
-                file "subtest.db";
-                request-ixfr no;
-               masters { 10.53.0.3; };
-        };
+       zone "test" IN {
+               type slave;
+               file "mytest.db";
+               masters { 10.53.0.3; };
+       };
+       zone "sub.test" IN {
+               type slave;
+               file "subtest.db";
+               request-ixfr no;
+               masters { 10.53.0.3; };
+       };
 };

diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index 87796fec5c19b019d88c984ab3c1e15bda13df85..c6ae8fb22881a6de74b51f75f13fbb9bc83c647c 100644 (file)
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 464f34278efe180147b44a1f17632441476d7913..b5022ee3223395e8a05c165b973d545dad7941d3 100644 (file)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index aa1d567ae9262871c013a5655c4797aed3d15c4d..cd9ba1ba29c8340b49d4e528e41d7b0606240382 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/legacy/clean.sh b/bin/tests/system/legacy/clean.sh
index eb2a10521c96ad6ebb78b839270016d0abd84457..8e73f683950bbac3f2eed4e218d07da2d538a52b 100644 (file)
--- a/bin/tests/system/legacy/clean.sh
+++ b/bin/tests/system/legacy/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index 4d59d7f39265443cb639fbba63487c71616de8e6..33ddbd209407dfa5c0afbaabd6f5e99f46276be8 100644 (file)
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns1/named2.conf.in b/bin/tests/system/legacy/ns1/named2.conf.in
index 911d8b5c7251663a8e5fbdbe67e6b9c07127bd27..b5d6a50a1b8fcde462042aed83474c85f7879efd 100644 (file)
--- a/bin/tests/system/legacy/ns1/named2.conf.in
+++ b/bin/tests/system/legacy/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns2/named.conf.in b/bin/tests/system/legacy/ns2/named.conf.in
index c8003e646546d1068d27c653efd16ad463eb4565..83c4ec1bcb47e48e01373fc20a6b2f637e5179fb 100644 (file)
--- a/bin/tests/system/legacy/ns2/named.conf.in
+++ b/bin/tests/system/legacy/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns3/named.conf.in b/bin/tests/system/legacy/ns3/named.conf.in
index 7493c1993bd473de9f84c8c495e6e9a60feb392f..e7db4c678adf6f8af6e86521e5cb60964cd077ea 100644 (file)
--- a/bin/tests/system/legacy/ns3/named.conf.in
+++ b/bin/tests/system/legacy/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns4/named.conf.in b/bin/tests/system/legacy/ns4/named.conf.in
index cba66b05bf7b7cf6ae736278889fb7e13e8a6eec..1ce3db6adfe22de5a5949f1afc5ca34a914de200 100644 (file)
--- a/bin/tests/system/legacy/ns4/named.conf.in
+++ b/bin/tests/system/legacy/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns5/named.conf.in b/bin/tests/system/legacy/ns5/named.conf.in
index 9116b9d48b991bb35e07c093ea2dfd67f51ee122..d87beccf67ff15def3723a2281b2562babf4d9e7 100644 (file)
--- a/bin/tests/system/legacy/ns5/named.conf.in
+++ b/bin/tests/system/legacy/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns6/named.conf.in b/bin/tests/system/legacy/ns6/named.conf.in
index e74b994f2981cadda539b9fac2785a1c30ed6300..1192eb9394e4385045a3474bcc3bc2ddbaa5132f 100644 (file)
--- a/bin/tests/system/legacy/ns6/named.conf.in
+++ b/bin/tests/system/legacy/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns6/sign.sh b/bin/tests/system/legacy/ns6/sign.sh
index d8dfbabd79e91ff19d39a5afdc7dcef6466a544c..5663287ed3420ad5d55626732b7525d97d6d4024 100755 (executable)
--- a/bin/tests/system/legacy/ns6/sign.sh
+++ b/bin/tests/system/legacy/ns6/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns7/named.conf.in b/bin/tests/system/legacy/ns7/named.conf.in
index 68541255142db1832f8d568b724795e36dc7b0a1..8e514ba90a363c756bef59606bdd26b7e2bb426c 100644 (file)
--- a/bin/tests/system/legacy/ns7/named.conf.in
+++ b/bin/tests/system/legacy/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/ns7/sign.sh b/bin/tests/system/legacy/ns7/sign.sh
index 4e8ca3248cfc397c23e9a2b655d68fa76d62f0e9..780e8cc9cd947d072db919a8d7c19f0149437115 100755 (executable)
--- a/bin/tests/system/legacy/ns7/sign.sh
+++ b/bin/tests/system/legacy/ns7/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh
index 7fb23e107aae1b0f8b87b7207910fb155ffceaf6..2795780a7bc91a8a59b0383afc4a2d151b1ade51 100644 (file)
--- a/bin/tests/system/legacy/setup.sh
+++ b/bin/tests/system/legacy/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index d20862ebcd45b0cd1d74b7b941b63e4239c64aa5..71b9c8467d56b2c6539da2dc1bc2550eae69435e 100755 (executable)
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index 55f48dbac61876f81385ed156eac5d48c162eb11..c8c2a5af1e1c0447d6a299e704713e28b0035aed 100644 (file)
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.in
index aeb0634af902a9d50a399472d4709b2f5c4d23a1..b5dbeffa5edaac8fbfde8d426fc995297ba391d4 100644 (file)
--- a/bin/tests/system/limits/ns1/named.conf.in
+++ b/bin/tests/system/limits/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/limits/setup.sh
+++ b/bin/tests/system/limits/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index 966fdd5f8008303f94b8b3b3be270dbd2ebab809..49445d0d8f4edaa6cd3f905e213aa607cefcf1d2 100644 (file)
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index 882968c8a736d47adf4305ee1b852666b15b959f..17838d9cb144c396d624919078d786a60335283b 100644 (file)
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/logfileconfig/ns1/controls.conf.in b/bin/tests/system/logfileconfig/ns1/controls.conf.in
index bc5b11015120ada0a6b6a35aafaf4b35cd278053..da0f7ac490bc0be44b913bfdebb1516252a60634 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/controls.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/controls.conf.in
@@ -1,13 +1,21 @@
 /*
  * 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
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 controls {
-        inet 127.0.0.1 port @CONTROLPORT@
-                allow { 127.0.0.1/32; ::1/128; }
-                keys { "rndc-key"; };
+       inet 127.0.0.1 port @CONTROLPORT@
+               allow { 127.0.0.1/32; ::1/128; }
+               keys { "rndc-key"; };
 };

diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf b/bin/tests/system/logfileconfig/ns1/named.dirconf
index a7bb5341b23b171f3a9846a0902580d8d6c5cddd..29e609f5f6b8fd75f9f3c9e2289edfed8574ef5a 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.dirconf
+++ b/bin/tests/system/logfileconfig/ns1/named.dirconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,19 +27,19 @@ options {
 };
 
 logging {
-        channel default_log {
-          file "named_dir";
-          print-time yes;
-        };
-        category default { default_log; default_debug; };
-        category lame-servers { null; };
+       channel default_log {
+         file "named_dir";
+         print-time yes;
+       };
+       category default { default_log; default_debug; };
+       category lame-servers { null; };
 };
 
 include "controls.conf";
 
 key "rndc-key" {
-        algorithm hmac-md5;
-        secret "Am9vCg==";
+       algorithm hmac-md5;
+       secret "Am9vCg==";
 };
 
 zone "." {

diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf b/bin/tests/system/logfileconfig/ns1/named.pipeconf
index 258db0d97ccdde5aae3c21a574b818d677aeb65d..7c999e192547babdabd8b02ff9077734a0155558 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.pipeconf
+++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,19 +27,19 @@ options {
 };
 
 logging {
-        channel default_log {
-          file "named_pipe";
-          print-time yes;
-        };
-        category default { default_log; default_debug; };
-        category lame-servers { null; };
+       channel default_log {
+         file "named_pipe";
+         print-time yes;
+       };
+       category default { default_log; default_debug; };
+       category lame-servers { null; };
 };
 
 include "controls.conf";
 
 key "rndc-key" {
-        algorithm hmac-md5;
-        secret "Am9vCg==";
+       algorithm hmac-md5;
+       secret "Am9vCg==";
 };
 
 zone "." {

diff --git a/bin/tests/system/logfileconfig/ns1/named.plain b/bin/tests/system/logfileconfig/ns1/named.plain
index 1d7b0587725b3ca95cd056f091a91da27a7bbe2f..0de0d184623ec0f8445d80522b0947e282518004 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.plain
+++ b/bin/tests/system/logfileconfig/ns1/named.plain
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,19 +27,19 @@ options {
 };
 
 logging {
-        channel default_log {
-          file "named_log";
-          print-time yes;
-        };
-        category default { default_log; default_debug; };
-        category lame-servers { null; };
+       channel default_log {
+         file "named_log";
+         print-time yes;
+       };
+       category default { default_log; default_debug; };
+       category lame-servers { null; };
 };
 
 include "controls.conf";
 
 key "rndc-key" {
-        algorithm hmac-md5;
-        secret "Am9vCg==";
+       algorithm hmac-md5;
+       secret "Am9vCg==";
 };
 
 zone "." {

diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf b/bin/tests/system/logfileconfig/ns1/named.symconf
index edf04e96764428e19889a4d09542108e8ab2ec8d..3309c8500de850a3da835290b6d3b9f637e2105c 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.symconf
+++ b/bin/tests/system/logfileconfig/ns1/named.symconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,19 +27,19 @@ options {
 };
 
 logging {
-        channel default_log {
-          file "named_sym";
-          print-time yes;
-        };
-        category default { default_log; default_debug; };
-        category lame-servers { null; };
+       channel default_log {
+         file "named_sym";
+         print-time yes;
+       };
+       category default { default_log; default_debug; };
+       category lame-servers { null; };
 };
 
 include "controls.conf";
 
 key "rndc-key" {
-        algorithm hmac-md5;
-        secret "Am9vCg==";
+       algorithm hmac-md5;
+       secret "Am9vCg==";
 };
 
 zone "." {

diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited b/bin/tests/system/logfileconfig/ns1/named.unlimited
index 7ba6374e72cd762e82a59d7bedf0ed05af710cd3..74ed658c1170f96da9c3b770aca4570296aafd3f 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.unlimited
+++ b/bin/tests/system/logfileconfig/ns1/named.unlimited
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/logfileconfig/ns1/named.versconf b/bin/tests/system/logfileconfig/ns1/named.versconf
index ea5ca5fd0e11597763ca47c530168ed69d747f95..2b156da79460ea0d143a63e95d492b5e200644b4 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.versconf
+++ b/bin/tests/system/logfileconfig/ns1/named.versconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/logfileconfig/ns1/rndc.conf.in b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
index 642c6601e28f3c245bbc8b7cabb37507112e1755..1e3908072216714f7a4a6d4cd128449044c65b68 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/rndc.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
index 0e28407a4a5c1bf6e9f12d9a02cb9c0b7651ac63..59ec6bc3bfc46fc52c6b6d0b01a8f27f144bab30 100644 (file)
--- a/bin/tests/system/logfileconfig/setup.sh
+++ b/bin/tests/system/logfileconfig/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index be164c5846594a7ac7b87713c73d3c207876258d..4bd8a2a1a32252ebd0963a3e5ddb62e3d9bbcc75 100644 (file)
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index e43344452bd8ef2a2c87c3da21c4ff817946d8db..458935afcb729ebc39882a3ea6372d962653b00a 100644 (file)
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2010, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.in
index 67de0b0da1fe30aec63ae2334e04151676d4a646..abbfe2e099061fb55e76a384a2f23bd372d51c1e 100644 (file)
--- a/bin/tests/system/masterfile/ns1/named.conf.in
+++ b/bin/tests/system/masterfile/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 6fb0b2da48496e6d70b86b18521a7767ba35bf97..5d38134eb35308078f00f1a7053997fbcaab3f39 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh
index d4f9dbc3588b6f8a66cbda9f25d97757ec7c651c..4b268ed3158714a0da57b5cd3335a766c3de9388 100644 (file)
--- a/bin/tests/system/masterfile/setup.sh
+++ b/bin/tests/system/masterfile/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index 82119f17b1a88ef050c2d06e69c55f6f1d136e89..0fb6396381f3129af9afae98fe3036a95e02b7f9 100644 (file)
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 769c51d6e18910a4fb3ea7a9524b0a03e22c7766..e0a8fbdc4ddca0e7cc0ecfc2e0c0930fa8ef0914 100755 (executable)
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2011, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in
index d88cfdd748522d1121bdf0e3e54ff98dec2ba483..0074503e1841dd18faa4d1e6a769eac279e7f9a1 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf.in
+++ b/bin/tests/system/masterformat/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -39,26 +39,26 @@ zone "compat-example" {
 };
 
 zone "transfer1" {
-        type master;
-        file "example.db";
-        allow-transfer { any; };
+       type master;
+       file "example.db";
+       allow-transfer { any; };
 };
 
 zone "transfer2" {
-        type master;
-        file "example.db";
-        allow-transfer { any; };
+       type master;
+       file "example.db";
+       allow-transfer { any; };
 };
 
 zone "transfer3" {
-        type master;
-        file "example.db";
-        allow-transfer { any; };
+       type master;
+       file "example.db";
+       allow-transfer { any; };
 };
 
 zone "large" {
-        type master;
-        file "large.db.raw";
+       type master;
+       file "large.db.raw";
        masterfile-format raw;
-        allow-transfer { any; };
+       allow-transfer { any; };
 };

diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.in
index 0d87bef2f8bd6a76d5cb78b9ef9b13c87d8b4f8f..8cf6bfbf0c28056b89d67647f7f639236954e81e 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf.in
+++ b/bin/tests/system/masterformat/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -32,27 +32,27 @@ zone "example" {
 };
 
 zone "transfer1" {
-        type slave;
-        masters { 10.53.0.1; };
-        file "transfer.db.raw";
+       type slave;
+       masters { 10.53.0.1; };
+       file "transfer.db.raw";
 };
 
 zone "transfer2" {
-        type slave;
-        masters { 10.53.0.1; };
-        masterfile-format text;
-        file "transfer.db.txt";
+       type slave;
+       masters { 10.53.0.1; };
+       masterfile-format text;
+       file "transfer.db.txt";
 };
 
 zone "transfer3" {
-        type slave;
-        masters { 10.53.0.1; };
-        file "formerly-text.db";
+       type slave;
+       masters { 10.53.0.1; };
+       file "formerly-text.db";
 };
 
 zone "large" {
-        type slave;
-        masters { 10.53.0.1; };
-        masterfile-format raw;
-        file "large.bk";
+       type slave;
+       masters { 10.53.0.1; };
+       masterfile-format raw;
+       file "large.bk";
 };

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 6ce030c1c541c7c81f0b87b75c5a859d69f453bf..edf78a580a6e23562c1aff0d0272098649409e0b 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 327041de1b7fe0d4ca672b9b7091016982aa18ac..9539abb2fea5be91f08a0bc0402a428926333602 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index c340289a64c7517f52499fae801dfe0db7d8d848..fce7f273c5602fdf18abf9cdb5177a93b27fd31b 100644 (file)
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 823ffb93831d12c89f87c790d60781fdb572ab78..585a1bb8f439e2b3ca8615f75ed4bb553559dcf1 100644 (file)
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index c392b51b52230aa9020b36807443d6cb7b5af707..60aa64b1f4163df34a895d25458be4ac1745922d 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/notify/ns1/named.conf.in b/bin/tests/system/notify/ns1/named.conf.in
index cae3cbb12eefb40d89de2d4ecb3c3215c3822def..70cb187c5706ec6ae3201c88f011198984085063 100644 (file)
--- a/bin/tests/system/notify/ns1/named.conf.in
+++ b/bin/tests/system/notify/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index 50f3be8dff78eb1259b6b36632a12917bce75ee6..6249ac116a6828870fd1b186876a41afec4cda92 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index 39b7df02d06d0450c1778aaba4f835b8e6be0066..ac26829a8a1126e953656e71c16a279f7c859b3d 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/notify/ns4/named.conf.in b/bin/tests/system/notify/ns4/named.conf.in
index 884c2a900e93e368e7e92540c303d1f83a5ae588..f9317e3c7a099eb7800e6a914a8cb7087834eeae 100644 (file)
--- a/bin/tests/system/notify/ns4/named.conf.in
+++ b/bin/tests/system/notify/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
index f5f08cdcb954af86d65441dc1cb94ef4dc37b2f7..b7f9cfa1e2fcf242d658b8b0dbf4d89124befc9c 100644 (file)
--- a/bin/tests/system/notify/ns5/named.conf.in
+++ b/bin/tests/system/notify/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index fe2e49316d39a7f5f3496263dd8e2b7cd0248637..b7782990aa27ca3a529546d5f34434c161c64dd8 100644 (file)
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index ebc47781a43990ccd8a956d75c7679473c52e06e..04d98fc4680cdcdaf91d0dd3d2de1b90eb98ee89 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh
index 1dd1a35aa04a2efe1b3a59c46c4ef8b9012543d7..32c72a0e189ce6c81e676dcb3f19c9e8799d0c4c 100644 (file)
--- a/bin/tests/system/nslookup/clean.sh
+++ b/bin/tests/system/nslookup/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nslookup/ns1/named.conf.in b/bin/tests/system/nslookup/ns1/named.conf.in
index c65d1e0b4716a312ae1127ad209323751b939c02..66612025c9a3fe15d9e510d4c2aecf86eb014871 100644 (file)
--- a/bin/tests/system/nslookup/ns1/named.conf.in
+++ b/bin/tests/system/nslookup/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh
index ba3d7e44d5580886b0d86d7e7d63321878cacfda..af7d71cb2c3b32304ff2495988f493436ecbac4d 100644 (file)
--- a/bin/tests/system/nslookup/setup.sh
+++ b/bin/tests/system/nslookup/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index fed98583cf018016b925e2f2abb3088e16ded118..638b474a1936a58b8f8f109134f4c182a69b8de5 100644 (file)
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nsupdate/ans4/ans.pl b/bin/tests/system/nsupdate/ans4/ans.pl
index ef341f7f380e82f74294add48e72a859b0380de6..f626541fbb2af13ede1c7fa3fe04620c4c7d73f6 100644 (file)
--- a/bin/tests/system/nsupdate/ans4/ans.pl
+++ b/bin/tests/system/nsupdate/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 7b56f45257ca9f2e9b2099241b4f98c2d052c86f..05df211433bd89d9b36190a6371a7862d69c6a39 100644 (file)
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index fa0b744aa914e58d612a51300e707c0c519604eb..29809fd8f13d414a69787c6b56a08e0457b7b9b1 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index 87dad7f790f081c3d03012bbc2e2cdb62441db7e..8f6fbd72e04d9600715887bb3939267784573cce 100644 (file)
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index ef82454253cb47aa72a6782a9c0cb8041068530e..c8d98287f6151360f10b58b3cb29338c29561104 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nsupdate/ns5/named.conf.in b/bin/tests/system/nsupdate/ns5/named.conf.in
index b1f885484ca4901a31f33487066a196f99f618de..ed764004bc4fc194ce977fc63a32e455cae800e9 100644 (file)
--- a/bin/tests/system/nsupdate/ns5/named.conf.in
+++ b/bin/tests/system/nsupdate/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh
index cd8914fa5575e6833afcfe0ae337964660683b21..9d6a02aa4db2b7e3f12f5cb76ff66fcef86744f8 100644 (file)
--- a/bin/tests/system/nsupdate/prereq.sh
+++ b/bin/tests/system/nsupdate/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 3d02c3deb2742b4412ef90d8db07acbdf045880e..8fa0a8e1425e3a893519e84450e2871e4f505d73 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl
index e54a338867ab6d9469d5b74d41eaef7a37e4da82..e658191933dceb6928dfae448745730c5a8292b4 100644 (file)
--- a/bin/tests/system/nsupdate/update_test.pl
+++ b/bin/tests/system/nsupdate/update_test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/nsupdate/verylarge.in b/bin/tests/system/nsupdate/verylarge.in
index 12a86b5bd91ba770719b811e9418f2ae78272e30..c81ed979d9a105ccbd9913b7160e10de2b3435ea 100644 (file)
--- a/bin/tests/system/nsupdate/verylarge.in
+++ b/bin/tests/system/nsupdate/verylarge.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh
index a0a7baf200b78129b9db70fd7ba25417eda83dc7..214a2c70b9b4810929fc6129039a42b29922740c 100644 (file)
--- a/bin/tests/system/pending/clean.sh
+++ b/bin/tests/system/pending/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/ns1/named.conf.in b/bin/tests/system/pending/ns1/named.conf.in
index 7eb04e5adc8d6003c3f3baec6308ea520694fd0e..280b7e9d67ff0bc468414c707517eac26bbe3271 100644 (file)
--- a/bin/tests/system/pending/ns1/named.conf.in
+++ b/bin/tests/system/pending/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index e352bc372967ad681c045698031bde9612c7b8e1..19bbcdbd665a2e15d51b5285f6022a0af62e6766 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index 1b8d3d6aa4c682138e2de202528a2ebca861c89d..e2bdbb8f7d4e65fe92fb8df970fc388ff91d8ae7 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/ns4/named.conf.in b/bin/tests/system/pending/ns4/named.conf.in
index c6e5155f6bbacbfcf4104b1488b3cee247dabb91..d8f058abcb715110fd4697d0a3bb5ed2e2acaef3 100644 (file)
--- a/bin/tests/system/pending/ns4/named.conf.in
+++ b/bin/tests/system/pending/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,6 +28,6 @@ options {
 };
 
 zone "." {
-        type hint;
-        file "../../common/root.hint";
+       type hint;
+       file "../../common/root.hint";
 };

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index 88a051e61d95ff167b4470aaef194c0c5d77688a..4f905a6935b583f1b2571dd73fb61c0f87a9e33c 100644 (file)
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index 74c87cba00634575b1d6b68e07a8715faa848bb5..ce3298d2a8e85af52fbaf172b9ec2a770a5e98d5 100644 (file)
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ans2/ans.pl b/bin/tests/system/reclimit/ans2/ans.pl
index a02b4ed65b82a0b4ba157ffe6a812c5c06b92587..2f7dcd96bca93b1226c1094c0b7a5876d2ae269d 100644 (file)
--- a/bin/tests/system/reclimit/ans2/ans.pl
+++ b/bin/tests/system/reclimit/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ans7/ans.pl b/bin/tests/system/reclimit/ans7/ans.pl
index a7495cbed66c5bbe3fac6a751daa3e2ec5430baa..4f9e14449571d2af20ba37e7dce05e6a966ac856 100644 (file)
--- a/bin/tests/system/reclimit/ans7/ans.pl
+++ b/bin/tests/system/reclimit/ans7/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/clean.sh b/bin/tests/system/reclimit/clean.sh
index 05176bbd00890cabce48315b4d931df71f6d0a7f..6bcae4f4064c0f29cca376760037bce166c1ea83 100644 (file)
--- a/bin/tests/system/reclimit/clean.sh
+++ b/bin/tests/system/reclimit/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.in
index ae5b9f6a88cf1f29f0da45010d8b4ea9b62f0407..4495f331e020d5488545729eeeaa6b364f4d4772 100644 (file)
--- a/bin/tests/system/reclimit/ns1/named.conf.in
+++ b/bin/tests/system/reclimit/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in
index 36bbd4d24e1b82170d556781340b01f0e3bcd60f..71698dc4e0a03ffa1c5ccf97f84c748c644a556c 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named1.conf.in
+++ b/bin/tests/system/reclimit/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in
index 5704ed918b7c811eb54972f860431c96a455c5a1..50a2038ed8312d631b58a5e6aaa16f5793fb79a8 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named2.conf.in
+++ b/bin/tests/system/reclimit/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in
index 64fcf357bc7da70fbaf762dc444565e07d731769..3c0f00c2736dc12177a798ec38a87fff81cd845b 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named3.conf.in
+++ b/bin/tests/system/reclimit/ns3/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in
index 8591cab836b570f7b2930b8e5ed83b414a038f36..9fd078c3fbbb39bb677d1ede28fc26af680a1c90 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named4.conf.in
+++ b/bin/tests/system/reclimit/ns3/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/prereq.sh b/bin/tests/system/reclimit/prereq.sh
index be7657d6d26a33544053b512594f11354dd95204..12df96ba394c163b04ca3fea691cfb6b20217755 100644 (file)
--- a/bin/tests/system/reclimit/prereq.sh
+++ b/bin/tests/system/reclimit/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh
index 42280a2d59f07462e1150c438c1d7e108d7b73d3..b1650811e9607e369f41532342975423af04fe25 100644 (file)
--- a/bin/tests/system/reclimit/setup.sh
+++ b/bin/tests/system/reclimit/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index bc8f36e3f4ca5d8044f00f8d8a9f25de4d2d429d..7cfb2268344a12914b402d5ddaeb15e6ff791c62 100644 (file)
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 2bc5c5d482374df867d8fe0f7a11e6c544f681e3..273faf4a6584baedbb919fcb885977b188ca09c0 100644 (file)
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 31803140bf4938869b65edf4afe4e4aee48eef25..91825c5c0f1db5f06fd3614657c9b037c0794a9e 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 10d8af6cfbdde518a28d3b064474ff68d6db58b0..ae38029aae0010c980225bfd5c49fada735953c9 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 48cf6f620a37bac137ddb80fb90a7f007450700e..a715810d8db92a5c6436f3892daa1f8b39e346e4 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index ac91c1f935ce22560cbd674a63fa9ddf2491cb67..e7d262a0635326fe3312d9569f1beed924245aaa 100644 (file)
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index 778a9227c3bc23cc23cb6ff51de15b7c7c720441..08490caad1deeb7fa27b1d83bc9dbd29fe31fc04 100644 (file)
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2010, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index d2663f2680e76129ec8d071c47401b2e42fbda94..798a3f7c6f20319f9e320407ae78e62efafb7677 100644 (file)
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/resolver/ans8/ans.pl b/bin/tests/system/resolver/ans8/ans.pl
index 3a1a969c4d400bbc4685e7da7dd6abc9eeae19f4..5865c336b53a4a139eb2a6d3a1eef5c52a0fb797 100644 (file)
--- a/bin/tests/system/resolver/ans8/ans.pl
+++ b/bin/tests/system/resolver/ans8/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index aff6c5767a8437cba226cbd727bf8a2d26a574e5..e975efb0ed56bbfa3be0a295fdadc63b86f7ede2 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index eb76671acbac075b3c6e2e97551b39f0d1661d92..0ad936db049814aa3cff45d9db150a25fef013ed 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009, 2013-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in
index 291b02c4f025b1289f8502f846e772ac817b44df..14ad0ec9619d80fa2722bb9e785bcfc1621f07a3 100644 (file)
--- a/bin/tests/system/resolver/ns4/named.conf.in
+++ b/bin/tests/system/resolver/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index 484721ac6fdf99ec27aeaed2fffef1751ead3c67..a7b91d496676a9f0adf18f63a9582dbd1f1bbea0 100644 (file)
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in
index 7e8fb4cbc6e6a252733c01abbe4c345473d3823a..fc80fd18941babdbb4fd7051176f5c8ce9ee0024 100644 (file)
--- a/bin/tests/system/resolver/ns6/named.conf.in
+++ b/bin/tests/system/resolver/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2012, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index 6c030e6f94e7214b9e3b5f9430715355c611fa0b..9a3c93d043157925361eccbc9a2ab95955126fed 100644 (file)
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index 262b33013c50c115ccd4ad65b17b18cb5cbfe6ff..4d63d28e6bdd93527ba40fbddbd85db21cebe4e8 100644 (file)
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index dcf7eeb7f95c3292d6fbe1baa834a946074fb41c..20f568c22fb9167afe01bd2ff2f835fd8ce6c574 100644 (file)
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 27c036b72716043ceabfef8e74859471588d657d..559c9a0625d03729e698c280ae063b1400958263 100644 (file)
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index f36276f1ee7a91d25bc3f5abf58b685cb1bce9a6..31c51f5b0edbb60b01dbe78b5fdfa9a2d217a30f 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index d06f96ebe0d6ff72161f6a0fdb07a3d0e3243422..2434ecc6b8218e4c39797e77f341fd502af38c3e 100644 (file)
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index 5694c6b171aa8d9a26bc1c9d1df45b10a53aa047..31135fefd14231d5adda0d4b3b2377213f37ddfc 100644 (file)
--- a/bin/tests/system/rndc/ns2/named.conf.in
+++ b/bin/tests/system/rndc/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,10 +17,10 @@
 options {
        port @PORT@;
        pid-file "named.pid";
-        session-keyfile "session.key";
+       session-keyfile "session.key";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
-        recursion no;
+       recursion no;
 };
 
 key rndc_key {
@@ -45,14 +45,14 @@ zone "." {
 
 zone "nil" {
        type master;
-        update-policy local;
+       update-policy local;
        file "nil.db";
-        ixfr-from-differences yes;
+       ixfr-from-differences yes;
 };
 
 zone "other" {
        type master;
-        update-policy local;
+       update-policy local;
        file "other.db";
 };
 

diff --git a/bin/tests/system/rndc/ns3/named.conf.in b/bin/tests/system/rndc/ns3/named.conf.in
index 48a4f4c8d8fce965240bd4f4afe759b70ce2eb4c..06d138f39e7230bd5b6d69d821f040575223f298 100644 (file)
--- a/bin/tests/system/rndc/ns3/named.conf.in
+++ b/bin/tests/system/rndc/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rndc/ns4/named.conf b/bin/tests/system/rndc/ns4/named.conf.in
similarity index 88%
rename from bin/tests/system/rndc/ns4/named.conf
rename to bin/tests/system/rndc/ns4/named.conf.in
index a2e5dee8dde0701a720a7db85535e1d408c68fff..59a5b7d5332b568e08e73bb6b109c2920b2b28ff 100644 (file)
--- a/bin/tests/system/rndc/ns4/named.conf
+++ b/bin/tests/system/rndc/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -36,5 +36,5 @@ key rndc_key {
 };
 
 controls {
-       inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 8663e763bc8622946bd32a7114241a82230e2329..6e47460c2a4fe24559069a97c483d313fd0010a4 100644 (file)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index c968d6406c0895340c2b09667ee5fb2c27b660ca..15e14f14fbf6a7b9e261c6b5d7ac9d1b072424eb 100644 (file)
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -1,8 +1,16 @@
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 # Clean up after rpz tests.
 

diff --git a/bin/tests/system/rpz/ns1/named.conf.in b/bin/tests/system/rpz/ns1/named.conf.in
index be27867d4d718c5c0336accf022f0dfcf87a061e..f052d814d047a8dae8aa256847323b69f2abc435 100644 (file)
--- a/bin/tests/system/rpz/ns1/named.conf.in
+++ b/bin/tests/system/rpz/ns1/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 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/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 options {

diff --git a/bin/tests/system/rpz/ns1/root.db b/bin/tests/system/rpz/ns1/root.db
index 7cba15eee2394f4157aefdcf85e3fd794d145f3c..f1d162788b17dd29e6ebd626a19c9cabf26b1f93 100644 (file)
--- a/bin/tests/system/rpz/ns1/root.db
+++ b/bin/tests/system/rpz/ns1/root.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 $TTL   120
 .              SOA     ns. hostmaster.ns. ( 1 3600 1200 604800 60 )

diff --git a/bin/tests/system/rpz/ns2/base-tld2s.db b/bin/tests/system/rpz/ns2/base-tld2s.db
index 81dfc490ba3296d1b6de8c91bc905989f5875814..37878e0b22598166deb8ad2789f9c76f512b99c1 100644 (file)
--- a/bin/tests/system/rpz/ns2/base-tld2s.db
+++ b/bin/tests/system/rpz/ns2/base-tld2s.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; RPZ rewrite responses from this signed zone
 

diff --git a/bin/tests/system/rpz/ns2/bl.tld2.db.in b/bin/tests/system/rpz/ns2/bl.tld2.db.in
index c2ea606c6d756275c1cf112d0ec5fec01cfcf904..41d397643c963956b3eefce366b8bea893558d7a 100644 (file)
--- a/bin/tests/system/rpz/ns2/bl.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/bl.tld2.db.in
@@ -1,8 +1,16 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; master for slave RPZ zone
 

diff --git a/bin/tests/system/rpz/ns2/blv2.tld2.db.in b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
index 3ffc91e9e9f45b617b277c828b043ad6bdcf696e..c5596d29179893d0546e9bb846e5940f1fb18c19 100644 (file)
--- a/bin/tests/system/rpz/ns2/blv2.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
@@ -1,8 +1,16 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; master for slave RPZ zone
 

diff --git a/bin/tests/system/rpz/ns2/blv3.tld2.db.in b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
index 28cc3b826adac4a5a3caa29b74a011c5a3bc4467..b9a2facff2fa2534cec48637a407ef571a12aaca 100644 (file)
--- a/bin/tests/system/rpz/ns2/blv3.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
@@ -1,8 +1,16 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; master for slave RPZ zone
 

diff --git a/bin/tests/system/rpz/ns2/hints b/bin/tests/system/rpz/ns2/hints
index 65cd978bcd7ac8cb71cdd2657c859efdaa1b233d..65b97f9987b10741b244fe7f63a62844986306a7 100644 (file)
--- a/bin/tests/system/rpz/ns2/hints
+++ b/bin/tests/system/rpz/ns2/hints
@@ -1,8 +1,16 @@
-; Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 .      120     NS      ns.
 ns.    120     A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in
index b53d65059c1bbe401f7db3d213d943f7da57c7d8..a5a8498eea1d46d0006c485fe8547d81677c031c 100644 (file)
--- a/bin/tests/system/rpz/ns2/named.conf.in
+++ b/bin/tests/system/rpz/ns2/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 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/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 options {

diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
index c32cc58c0ea5bdbebfa6aa7fe2e7616c97d9f7e1..576c1feae5de2349f311733762bf9c63992eb4dd 100644 (file)
--- a/bin/tests/system/rpz/ns2/tld2.db
+++ b/bin/tests/system/rpz/ns2/tld2.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; RPZ rewrite responses from this zone
 

diff --git a/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index 2bdac14be2fb0c2153229c50ba901d7559c87e04..15855d97ba00666ae78bf0122518b084aea6ba01 100644 (file)
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; RPZ test
 ;   This basic file is copied to several zone files before being used.

diff --git a/bin/tests/system/rpz/ns3/hints b/bin/tests/system/rpz/ns3/hints
index 65cd978bcd7ac8cb71cdd2657c859efdaa1b233d..65b97f9987b10741b244fe7f63a62844986306a7 100644 (file)
--- a/bin/tests/system/rpz/ns3/hints
+++ b/bin/tests/system/rpz/ns3/hints
@@ -1,8 +1,16 @@
-; Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 .      120     NS      ns.
 ns.    120     A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index e26b7716ee881c5049890e974a8c05195cdef108..c909a8620b9369c8c17343e28411594f2b5296f1 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 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/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /*

diff --git a/bin/tests/system/rpz/ns4/hints b/bin/tests/system/rpz/ns4/hints
index 65cd978bcd7ac8cb71cdd2657c859efdaa1b233d..65b97f9987b10741b244fe7f63a62844986306a7 100644 (file)
--- a/bin/tests/system/rpz/ns4/hints
+++ b/bin/tests/system/rpz/ns4/hints
@@ -1,8 +1,16 @@
-; Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 .      120     NS      ns.
 ns.    120     A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns4/named.conf.in b/bin/tests/system/rpz/ns4/named.conf.in
index f92afd0a912dd915db483317af84853794e5051a..193f1c0942fca31a84741d19dbb282296b2426bd 100644 (file)
--- a/bin/tests/system/rpz/ns4/named.conf.in
+++ b/bin/tests/system/rpz/ns4/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 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/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 options {

diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
index 982580c954f385861f893b69c008a656c368cb91..7d5ddb4f0bce955d16181fc6a8ae343e5f3b3720 100644 (file)
--- a/bin/tests/system/rpz/ns4/tld4.db
+++ b/bin/tests/system/rpz/ns4/tld4.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 ; RPZ rewrite responses from this zone
 

diff --git a/bin/tests/system/rpz/ns5/hints b/bin/tests/system/rpz/ns5/hints
index 30c269d4427c96874b1ba578583c6d72efb73d37..db4ac083fa7bcf8d4cabba611466648ecc9ab3a1 100644 (file)
--- a/bin/tests/system/rpz/ns5/hints
+++ b/bin/tests/system/rpz/ns5/hints
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 .      120     NS      ns.
 ns.    120     A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in
index 8825a5257476606765a07e71274e401c116ff671..98dcbde66d5a1015b834d60d4f30b33f8e2e5472 100644 (file)
--- a/bin/tests/system/rpz/ns5/named.conf.in
+++ b/bin/tests/system/rpz/ns5/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 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/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /*

diff --git a/bin/tests/system/rpz/ns5/tld5.db b/bin/tests/system/rpz/ns5/tld5.db
index 55fe3ae2731a3ebd55460218c47c2406d4a6988a..008c2c37cb733f32c984792fed36d9a5bd1718ed 100644 (file)
--- a/bin/tests/system/rpz/ns5/tld5.db
+++ b/bin/tests/system/rpz/ns5/tld5.db
@@ -1,8 +1,16 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/ns6/hints b/bin/tests/system/rpz/ns6/hints
index 47815eb45829114f0e20b5ffae479660b0dfc327..ec6417ebe5795e736d4f3fcf5d9ccdeab1382eab 100644 (file)
--- a/bin/tests/system/rpz/ns6/hints
+++ b/bin/tests/system/rpz/ns6/hints
@@ -1,8 +1,16 @@
-; Copyright (C) 2014, 2016  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
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 .      120     NS      ns.
 ns.    120     A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in
index 848437248c75ce0ad9b8df6f58b024fba69ed663..e3682d39f9ab2c5e7a3c91954964234b09e3e4b9 100644 (file)
--- a/bin/tests/system/rpz/ns6/named.conf.in
+++ b/bin/tests/system/rpz/ns6/named.conf.in
@@ -1,9 +1,17 @@
 /*
- * Copyright (C) 2014  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
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 options {

diff --git a/bin/tests/system/rpz/prereq.sh b/bin/tests/system/rpz/prereq.sh
index 0eacf1db84b0ff2bc23fce4afe0edf660ee6b2b7..a8efab2384f13e6ef3285e274c67ac78cf5bb783 100644 (file)
--- a/bin/tests/system/rpz/prereq.sh
+++ b/bin/tests/system/rpz/prereq.sh
@@ -1,10 +1,18 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/rpz/qperf.sh b/bin/tests/system/rpz/qperf.sh
index 2982c9cc7261c095dbefcfb5f992fbb934be9da4..29dee849c671a7e033bdf6e4a16d076fcd39b83b 100644 (file)
--- a/bin/tests/system/rpz/qperf.sh
+++ b/bin/tests/system/rpz/qperf.sh
@@ -1,10 +1,18 @@
 #! /bin/sh
 #
-# Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 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/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 for QDIR in `echo "$PATH" | tr : ' '` ../../../../contrib/queryperf; do
     QPERF=$QDIR/queryperf

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 8ef4e49c8ee35588cab8dcfda5f26ed64fb6cf84..c0c0547ef483d47a0c38b6b4f75d42cf228e81ad 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -1,10 +1,18 @@
 #! /bin/sh
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 set -e
 

diff --git a/bin/tests/system/rpz/test1 b/bin/tests/system/rpz/test1
index 311cf1e1def025f56b3294aff35db60f14488fe3..127e9a93bd8aa67c3ba30d67d4bbcdfe903454b4 100644 (file)
--- a/bin/tests/system/rpz/test1
+++ b/bin/tests/system/rpz/test1
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/test2 b/bin/tests/system/rpz/test2
index eaf47e9f7b17ad90f888dba2e42d1461f1338b53..d76639062138c2e79a1076f9fe82f72cfb0dca42 100644 (file)
--- a/bin/tests/system/rpz/test2
+++ b/bin/tests/system/rpz/test2
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index 46a288344ae3da8300847561e71cab135606483c..df3a96b3d796dc47fb12c74e3ba4d3dca2e615ca 100644 (file)
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,8 +1,16 @@
-; Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index 0c338f933b52d89b51a97c977b86a5fb25f511a1..8baddc43cf6210ab091d934d2f01e6c888611e34 100644 (file)
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,8 +1,16 @@
-; Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/test4a b/bin/tests/system/rpz/test4a
index 7b770a77097d559861115a9d42efe7773235a070..b66b08c86a66f3e37fc1f2568e2f7aae2bce4e95 100644 (file)
--- a/bin/tests/system/rpz/test4a
+++ b/bin/tests/system/rpz/test4a
@@ -1,8 +1,16 @@
-; Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/test5 b/bin/tests/system/rpz/test5
index 24cf432555597d98ca7df813192f17c666660484..dec5ce18eabdfa5f28c66025ce8aa70c9b6b839c 100644 (file)
--- a/bin/tests/system/rpz/test5
+++ b/bin/tests/system/rpz/test5
@@ -1,8 +1,16 @@
-; Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 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/.
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
 
 
 

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 62b17e5ae420254ed20d3e2b2a396e1f29251a43..233d933e3a10854cff6374e6ac4012138c5fd033 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -1,8 +1,16 @@
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 # test response policy zones (RPZ)
 

diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index d66a6cca11bf404de0a9c2b8179e8467aa2cc68e..707b7e253bb0c2a4de4b5803cb149685442e6101 100644 (file)
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in
index 78dbb06e4d693f5e0066a5e60098a4cee58939e7..216b83b888b7d2b3306a4666b650a81e6879a06b 100644 (file)
--- a/bin/tests/system/rrl/ns1/named.conf.in
+++ b/bin/tests/system/rrl/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in
index b1ae53054a1c70a90d8bf0c292bda97831fa2152..26f36428b5527509ad41a9b4838553726d75f5c9 100644 (file)
--- a/bin/tests/system/rrl/ns2/named.conf.in
+++ b/bin/tests/system/rrl/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in
index 2d3321c5d785a8ef47fc581bce1a662730ba1b16..d4e8780b902c7cbb4bc03b52503c36574029304d 100644 (file)
--- a/bin/tests/system/rrl/ns3/named.conf.in
+++ b/bin/tests/system/rrl/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/prereq.sh b/bin/tests/system/rrl/prereq.sh
index b8e0d34f1db08730f6d5d210f1ad301b6c0315f7..beea978ceb7d2738b10a7838bdd98528d5d60609 100644 (file)
--- a/bin/tests/system/rrl/prereq.sh
+++ b/bin/tests/system/rrl/prereq.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index d458645525939256ac00bfc5199dc771e98c5907..86830aff3afd511571dd8c01e3d3eb201be4d126 100644 (file)
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index a1740290b9076d16056e29e9697d4b7c9e800cf7..6b9f173983cbfb6ef5a61217cf78084af9d96d0e 100644 (file)
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index 46754d7c3a2e37362282f43cd0d752604695e902..53cf3f8fe9e28788e57671eef264c3eb7772d3d7 100644 (file)
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008, 2011, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.in
index d2f478adc8a145a60a6633027084709cee0757ae..80ebe72ff8d1a38c49d21f97f25c87b3541637ae 100644 (file)
--- a/bin/tests/system/rrsetorder/ns1/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.in
index 7c0879381e85a189fb1510867a7ab2878a26eb4a..414aebf116f83357cbd9420ca5c8c8f6a3940228 100644 (file)
--- a/bin/tests/system/rrsetorder/ns2/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in
index f53e91ce211384a509f92c5a6b74dc6e49b84944..766c00c3cdf4f03e7d5671eaf990a392885da55f 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in
index 8425c7a0c5520ab2bc4554e6d3f404795ef44c09..51084b5d189b83b6d5445070a98757943ba440e6 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh
index a3303c31178a604e5612816b1d265195d1bbe175..886cc1ba58a1fcae04bd41ab5dfc95a3c76aa614 100644 (file)
--- a/bin/tests/system/rrsetorder/setup.sh
+++ b/bin/tests/system/rrsetorder/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index f21b260ac2bdd689e33789c39f5d94209729d599..ee7a51d3c093fa70ef8f4f1b451d6637671f4cfe 100644 (file)
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh
index e3603d39a13be9c322f3a1bcbcc7cbcdc1581c83..ca700c24a48ddec191b6515781a46d99425346c2 100644 (file)
--- a/bin/tests/system/rsabigexponent/clean.sh
+++ b/bin/tests/system/rsabigexponent/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.in b/bin/tests/system/rsabigexponent/ns1/named.conf.in
index 718244bdda88c1ee2b1f8c156f6456ce76e58a62..b4704f71d45807ef90ccbea77897e3a99790b260 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index 485e9258cc6f331430b9022ac0a2f3cb1a533745..e9164dcb9ec8ffa73f0d892e48bed2724ca1a9dc 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/ns3/named.conf.in b/bin/tests/system/rsabigexponent/ns3/named.conf.in
index c27f8b53471c141c94579e8babecffa2c7e282e6..988c1e1650e129438cdd5185b7a04d6b047261cf 100644 (file)
--- a/bin/tests/system/rsabigexponent/ns3/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/prereq.sh b/bin/tests/system/rsabigexponent/prereq.sh
index c61467e8d96d4c075e39abee45b332afb70e9418..34cdb6363b130d48c7e7ccfd7029d838b31d75a0 100644 (file)
--- a/bin/tests/system/rsabigexponent/prereq.sh
+++ b/bin/tests/system/rsabigexponent/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 1b162a23c088be021687545ce2447d6ab6ff14fd..3c9ce43b896b7f2950e3a62265bab867a66bdd82 100644 (file)
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh
index 51a7170427203dffd0101ac5afb32603d70558df..0d79ea0bf3a1ca0527fae5a71c8c7f0af376cc73 100644 (file)
--- a/bin/tests/system/rsabigexponent/tests.sh
+++ b/bin/tests/system/rsabigexponent/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 4b8e141ed5aac54ca135fea16aded71414c08e19..ce73443c83c63c62dbf138751a324d2ef0442cbb 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/runtime/clean.sh b/bin/tests/system/runtime/clean.sh
index 65c8484886ac89e88b90f34a248e41c17f3eecab..f39443e6c1ed18a7539723dcbea8c8728768dd38 100644 (file)
--- a/bin/tests/system/runtime/clean.sh
+++ b/bin/tests/system/runtime/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt1.conf.in b/bin/tests/system/runtime/ns2/named-alt1.conf.in
index 46507643ad56a7b77229e0d8002002c7686cc920..52eed2edd18df417b6497019e2d551b03fb2d6e6 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt1.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt2.conf.in b/bin/tests/system/runtime/ns2/named-alt2.conf.in
index 54ee361d294f3214e2042664f6a3c9306d624f64..ca6d8cc2d8c3e2923788fcda3e46bacc8d25b33c 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt2.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt3.conf.in b/bin/tests/system/runtime/ns2/named-alt3.conf.in
index aeab8224ef2e8f240c2a54fdfbcf0cdbd2f17ce6..50bb2003b7852f350c8006a11b77b775561f9d13 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt3.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt4.conf.in b/bin/tests/system/runtime/ns2/named-alt4.conf.in
index 26463dfa6d430633870c5e778d2f833a2daf817e..e414bf38a56baf2e08974a53949d35d9e1fdc290 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt4.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt5.conf.in b/bin/tests/system/runtime/ns2/named-alt5.conf.in
index f327a99f26c8e47e11f6a75125e708c8d30844f5..c7733c033e9cdf5530091487c04a00159748cb54 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt5.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named-alt6.conf.in b/bin/tests/system/runtime/ns2/named-alt6.conf.in
index 9795235c0e6fd2780509d12d7d426d0a493a20a7..961649e49e0d9aed6604ed6ac1446a991417dfea 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt6.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt6.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/ns2/named1.conf.in b/bin/tests/system/runtime/ns2/named1.conf.in
index 13cf3c6666acbba6508fa49309a8b17b85ecaa8a..b2420f73213f31b3ba71b7bab39fd0d45a3873ba 100644 (file)
--- a/bin/tests/system/runtime/ns2/named1.conf.in
+++ b/bin/tests/system/runtime/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index f171c7fcf526190bc8b8925d7e0a2da48221980b..8cd0e061df53ae8c5d189bb69e3af03135e32047 100644 (file)
--- a/bin/tests/system/runtime/setup.sh
+++ b/bin/tests/system/runtime/setup.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index e2b39da0781aa9701877b92e299a4740d8451699..c341e0b2e01debe1396ab449e04fe9a757cb87e1 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index a95c9f4dcbaa846b6c51065de514f3ba32429439..7a1bfd7ad109426058e35ed79019964e8a9d35fb 100644 (file)
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 77d0ab394b777c1b8e429fc824ea95b48681d49d..edb96302170f1382ccce3174a31942a912f01014 100644 (file)
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/sortlist/ns1/named.conf.in b/bin/tests/system/sortlist/ns1/named.conf.in
index fdb05259c959d6975a6d3b173fca359d26d7e3d2..124809dc453121b8e0e507e0abd0cb94815bb360 100644 (file)
--- a/bin/tests/system/sortlist/ns1/named.conf.in
+++ b/bin/tests/system/sortlist/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/sortlist/setup.sh b/bin/tests/system/sortlist/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/sortlist/setup.sh
+++ b/bin/tests/system/sortlist/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index a79b2e38b18068be7adc990f6b77ac2996db5b9d..bed70edd7521264837a10d36ae8d7cf858361c9f 100644 (file)
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index bb024bfdb283806a292111101a228e02fda274ab..ef747c21538f790b6b7ac32172201a0663a44a64 100644 (file)
--- a/bin/tests/system/spf/clean.sh
+++ b/bin/tests/system/spf/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/spf/ns1/named.conf.in b/bin/tests/system/spf/ns1/named.conf.in
index 2e2e9c44fb686d897c0373686e0ff37ab30d54c1..8d0651d64b1cca350e5c01fd8dfbf1073f648680 100644 (file)
--- a/bin/tests/system/spf/ns1/named.conf.in
+++ b/bin/tests/system/spf/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh
index c69f051dbc3b1d19cb835b4c9f330142cc854e35..fc26d954ed13e339997722d9e84c15c284db79f6 100644 (file)
--- a/bin/tests/system/spf/setup.sh
+++ b/bin/tests/system/spf/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh
index 9b936e75a716268fc9924c2777e63a9c7f6506a9..845de1bf3fae1c7bc0131576f5b3f83b36a38f18 100644 (file)
--- a/bin/tests/system/spf/tests.sh
+++ b/bin/tests/system/spf/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index e0bf831d381c2e6f4b75ea0657bc91f4349db0e6..f01bbe9425d4afdc3788a32403eae00ed4b7e0c5 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2004-2008, 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008, 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh
index b53f1fe611b4653d63fda85606b456fc84e07ddc..aad6ac4a16a438284c21a9b491cf4c2ca2c056d0 100755 (executable)
--- a/bin/tests/system/staticstub/clean.sh
+++ b/bin/tests/system/staticstub/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/ns1/named.conf.in b/bin/tests/system/staticstub/ns1/named.conf.in
index a7b2cb610b695ef3fdc655256bd2db3ad86d96e0..ce9aef84f72e801ac9c65f648b794888b2bcff10 100644 (file)
--- a/bin/tests/system/staticstub/ns1/named.conf.in
+++ b/bin/tests/system/staticstub/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in
index f0bc6b5e80722194160052d3bec65e4020d60e91..871b40cfce02eadaa998a606037c7f13e413647c 100644 (file)
--- a/bin/tests/system/staticstub/ns2/named.conf.in
+++ b/bin/tests/system/staticstub/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in
index ab41fdac011ea89fd55008ac7ad6b0166fe6324e..b722536afb505f19d3267a1b5b67aa959ad5e0cd 100644 (file)
--- a/bin/tests/system/staticstub/ns3/named.conf.in
+++ b/bin/tests/system/staticstub/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/ns4/named.conf.in b/bin/tests/system/staticstub/ns4/named.conf.in
index 87cd92a8d4a59c216cbf70e8c82cbc5ffe299f30..20cfb544f90ee5fd77631335725a6f0082a71645 100644 (file)
--- a/bin/tests/system/staticstub/ns4/named.conf.in
+++ b/bin/tests/system/staticstub/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index 55136dcc168b82c15d4c0aba0b71d1a2bb0ae1b3..b8a9e85da694cafa783e622dd6a002bf4e3b5020 100755 (executable)
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index c40b7979fa103cd6e8221cd3a605f5f5abb84c42..a18a4932b9b99745b79db8d0a61e5038d3dab8bf 100755 (executable)
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index b03798c711eb44767ff12a474e22b13c298d29c8..ccf5e459ac0d46d4e7900388af8e0b176c4dd5b0 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2004-2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index b73bcd124da49468b5d6f5b78f31e88026034f35..9f19df8874b5530cc1b860db284407bce4e58455 100644 (file)
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.in
index cae3cbb12eefb40d89de2d4ecb3c3215c3822def..70cb187c5706ec6ae3201c88f011198984085063 100644 (file)
--- a/bin/tests/system/stub/ns1/named.conf.in
+++ b/bin/tests/system/stub/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index 52fd53e2d2caa3aae35dbb35dd0e181e21c92bbc..483b1aa4e18364ddf374f7922981724730b900cd 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index ca08bff60bda789157e6f352c23a6287c4d8667a..efb75ea406ee779e95884f7784fea56e11768c68 100644 (file)
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh
index 5a1b70fb72ed62f6ce9e1d36b0039c065c18ff49..91b06ef0da133687fd91b8d1286d0d6978b91fb6 100644 (file)
--- a/bin/tests/system/stub/setup.sh
+++ b/bin/tests/system/stub/setup.sh
@@ -1,10 +1,18 @@
 #!/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
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index 657065438f3846c91cf8b63150a6d0fa4659c8b1..fb9ca6b1f4ae20ace12d8321cf9707e4d9d5a75e 100644 (file)
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index 7ec161073144c8a027ae1cd1c95ef134d3e9581d..b71237cbfa15c748b8bc55cda05475e4211dd2de 100644 (file)
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
index 108e8c3e7747368e0b4a4d4585c8acb5154f5e8a..75529fd51184a1095d2cbb63efd26fd039369391 100644 (file)
--- a/bin/tests/system/tsig/ns1/named.conf.in
+++ b/bin/tests/system/tsig/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
index 5058c2c5f690aaa584accc1182f5443fe2d8e051..2badacb61b45044996ead9be413c0e9c3d52607b 100644 (file)
--- a/bin/tests/system/tsig/setup.sh
+++ b/bin/tests/system/tsig/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index 5e5d791b57b65ff7851d9f7af7b3c06a88e884ce..33ac22a25a8e411dda90e843b97bbdc37c58d84f 100644 (file)
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsiggss/authsock.pl b/bin/tests/system/tsiggss/authsock.pl
index 5ea86284b8171eb44b64d8c7cb16b5f02cddf1c2..28a03c6c71699db45af69e834188db6746e4ea29 100644 (file)
--- a/bin/tests/system/tsiggss/authsock.pl
+++ b/bin/tests/system/tsiggss/authsock.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.in
index bb8096db29741273e92180fdcb6376e9c07c6668..033db306bcf398079282854f668c11e927ebe4ae 100644 (file)
--- a/bin/tests/system/tsiggss/ns1/named.conf.in
+++ b/bin/tests/system/tsiggss/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh
index d45508d5133f6eb864507215d4c94693cc9de8bf..1b829d0320636491d7bb4c12381a7b7564fac76a 100644 (file)
--- a/bin/tests/system/tsiggss/prereq.sh
+++ b/bin/tests/system/tsiggss/prereq.sh
@@ -1,6 +1,6 @@
 #!/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")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index 54d34cc503f485fcb38e11134496914dccf670af..6ed1867df13faeec1853a38272b7ae2495c9a73e 100644 (file)
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index 4455ab18c67c79f82aafe6868cab60b9cbcaf669..2819482def75382d40486abea6421c053a405cd4 100644 (file)
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2013, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.in
index 2bc21637ec61da7c94027d8611e4808566eeebba..f91764022c1efd5e974bd9a7128a608abc9bf5af 100644 (file)
--- a/bin/tests/system/unknown/ns1/named.conf.in
+++ b/bin/tests/system/unknown/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/unknown/ns2/named.conf.in b/bin/tests/system/unknown/ns2/named.conf.in
index e6c432733977520590386c1c08cfc87045f6ba15..09c7169b623a3efdd542c8c3d90171ae51668f54 100644 (file)
--- a/bin/tests/system/unknown/ns2/named.conf.in
+++ b/bin/tests/system/unknown/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/unknown/ns3/named.conf.in b/bin/tests/system/unknown/ns3/named.conf.in
index 1ad856b524bf9cf53c456d62e94ba9720d6b1323..6aa39636b7319a749edf224eac4ab4d39dfde23b 100644 (file)
--- a/bin/tests/system/unknown/ns3/named.conf.in
+++ b/bin/tests/system/unknown/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index a3f2c2a687270caf8463030c456851a135b49114..4e59769f3066ed059adc5f8491258ff20943a623 100644 (file)
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index f6cd1f182af80a1ea077f96ee04b6b51e80c5dc5..69c1409a8de4add11df275a6d856aa244c0cdf86 100644 (file)
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/ans4/ans.pl b/bin/tests/system/upforwd/ans4/ans.pl
index 5d1a099ab06b95b704bcbfa38e827fc8e6edbc47..2002887fad26a72b60a12a499e471f56381bc682 100644 (file)
--- a/bin/tests/system/upforwd/ans4/ans.pl
+++ b/bin/tests/system/upforwd/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index 8d050de82de53b1d561cb2fcf7ac94cb5ab9406e..f32701d31d7eb159f582e53e0dc9a93f4e50f157 100644 (file)
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
index 5f4c3801913d204ad2425be74c71d82e5a9e9fe3..04d9c850a91efe66bc77da31c7ba3fb91ef8001f 100644 (file)
--- a/bin/tests/system/upforwd/ns1/named.conf.in
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.in
index 089eef045e918bdeda7b989dd6ca99b0b4a2e1e1..02284ee61e15e2bfcb2ab4783e550dbbee8d4c8c 100644 (file)
--- a/bin/tests/system/upforwd/ns2/named.conf.in
+++ b/bin/tests/system/upforwd/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in
index 313b68b4687375d97c2ee66a110ee8976b77f387..7b31ce075721a4ca64c823bfcdf1ff2f14154d9a 100644 (file)
--- a/bin/tests/system/upforwd/ns3/named.conf.in
+++ b/bin/tests/system/upforwd/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh
index e44a03b1f74dc4274a45435e1567b732d130e4d5..d4119dea971d01d8872af920f7721bbc56f39f1b 100644 (file)
--- a/bin/tests/system/upforwd/prereq.sh
+++ b/bin/tests/system/upforwd/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 59f7542a2b8e7d51ceec1cfd9e1da00d1c42b922..658f16006ee06032f8e4083dd809cf44a46d775c 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 5dc3f69c5e0ced13cd27a7966e87f8c4074a84e4..556bc1654ec02c294c5e88ea81a7693062209eb2 100644 (file)
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh
index 69009fdec78d53fcf58aa8c6129eb7cb412a4641..c4b1b8c261992de1ae78bd2391ebda141d1c2175 100644 (file)
--- a/bin/tests/system/verify/tests.sh
+++ b/bin/tests/system/verify/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh
index aa67358a2bdfbd85521dcab3e13d829b786e1870..7635b06d46ef9a846e72b45da98cd3f550760bce 100644 (file)
--- a/bin/tests/system/verify/zones/genzones.sh
+++ b/bin/tests/system/verify/zones/genzones.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index b21b60be14a5f384ee8b314b45c3c6c37a7d09a7..3c1f9e57e9ee7312537de68c47ec5aab9c10e2e3 100644 (file)
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005, 2007, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in
index cae3cbb12eefb40d89de2d4ecb3c3215c3822def..70cb187c5706ec6ae3201c88f011198984085063 100644 (file)
--- a/bin/tests/system/views/ns1/named.conf.in
+++ b/bin/tests/system/views/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index 5c2b811e9ae3521592a1057552ff9c38efcacf8a..88511fbdcecec884b4eaa31288fc4225ea13f925 100644 (file)
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index 8f21acb9d1410ac0f9201816196313c1f59bfa68..7aa0529d6f6556b0192f04cb484a0c284b968b05 100644 (file)
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index e7ce8dd75f91363545065c74f93a7b4f2ae4df97..c5b371f507e095abfbb8e4237f9d2ba4299c1a9c 100644 (file)
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,8 +29,8 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
@@ -44,6 +44,6 @@ zone "." {
 
 zone "example" {
        type master;
-        allow-update { any; };
+       allow-update { any; };
        file "internal.db";
 };

diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 317895fa43a68db63c48a45a582c72463fb1f4de..330d4bf9beab3308e01dea5a84db5a41438f28ad 100644 (file)
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,8 +29,8 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
@@ -45,6 +45,6 @@ zone "." {
 zone "example" {
        type slave;
        masters { 10.53.0.2; };
-        allow-update { any; };
+       allow-update { any; };
        file "internal.bk";
 };

diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index ea58c083083fac3e1c0acffd4eac212e7f29e1f7..2b48ea220144e1a5dedadd4042b14b6ec184f836 100644 (file)
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 7e85be73b1244af8fbf38244b29fa5d24794b870..70c27ec1e1b31e416b3f7f9e4803c007dc3010d1 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh
index adc7fa17a4ae208745246984e44b17cd4813589c..a5920b64d9117ffd44ae16d50f7052422bf7a4d3 100644 (file)
--- a/bin/tests/system/wildcard/clean.sh
+++ b/bin/tests/system/wildcard/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in
index e8ca2d35fe7f897383212733dc5961377ac1bd5e..7697d4a7d611deb1af6f6041149dbc981781ef9d 100644 (file)
--- a/bin/tests/system/wildcard/ns1/named.conf.in
+++ b/bin/tests/system/wildcard/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 65cccf5fe8e13d624e9dc28020925de7ad44f20f..20ea935d286c6169f2cf68075bc3ca15c2ced29b 100755 (executable)
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in
index d26bf5d70a1101c0781cd4b23b9d527a82969935..bb6358d8133c6711b60e10f0e53e0acc5513326d 100644 (file)
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in
index dc551ef436ae3d05a0c75c34aa27e95ebe1d5dc1..c4fe6ae1abc9e3a195fa5d94f91c1e029fe8b318 100644 (file)
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns4/named.conf.in b/bin/tests/system/wildcard/ns4/named.conf.in
index 7d9437a8f1c2e9c2d41fe7ed64a54291c49e3700..86e143a5cf623a4aadba47940f536ab5d2462d1a 100644 (file)
--- a/bin/tests/system/wildcard/ns4/named.conf.in
+++ b/bin/tests/system/wildcard/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in
index f670313fd94b9836f15a6b867b0432739ca682b9..52589d59716d59668da502c39188fe56c2d0e187 100644 (file)
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index 9d4783a70fc301feba047c29ca9330b268b4f78a..cd62f481af1056c7e04efd094797a2496cc5e8e0 100644 (file)
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh
index 2a044d1406664b6a1a1aea5964b75426fd858177..8a46ae0acd4c013bfefbc33d3708ccd6c460ba1f 100644 (file)
--- a/bin/tests/system/wildcard/tests.sh
+++ b/bin/tests/system/wildcard/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 1ac5523cf1db54014b3808af4cd00f23ab8bd468..ebcf5a9816b8426a131a53a38575f57ff0ce34ef 100644 (file)
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xfer/ns1/named.conf.in b/bin/tests/system/xfer/ns1/named.conf.in
index 5569e44d39055bf327c69a972a066fd5ab7b4b12..cc043683a1fafdb1c544a97bd6217b0a1ae6eb0b 100644 (file)
--- a/bin/tests/system/xfer/ns1/named.conf.in
+++ b/bin/tests/system/xfer/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index 87d9cfa83dcd252dad529391896bfe4505ddac0a..9bfa715bbd0c2c91b070d945e6077d37e3046f47 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index 501331e440fd2a63eac7d986249c45f180421f66..198792dbbf702e21ec0c7ca2c6a205ae25c6a6ec 100644 (file)
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,8 +29,8 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-md5;
+       secret "1234abcd8765";
+       algorithm hmac-md5;
 };
 
 controls {
@@ -38,8 +38,8 @@ controls {
 };
 
 key tsigzone. {
-        algorithm hmac-md5;
-        secret "1234abcd8765";
+       algorithm hmac-md5;
+       secret "1234abcd8765";
 };
 
 zone "." {

diff --git a/bin/tests/system/xfer/ns4/named.conf.base b/bin/tests/system/xfer/ns4/named.conf.base
index e27567bd16675a913edfd91155492786b50fa419..12716e5a93e89721abef848572488aecfabd752f 100644 (file)
--- a/bin/tests/system/xfer/ns4/named.conf.base
+++ b/bin/tests/system/xfer/ns4/named.conf.base
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.in
index a6c4ff78aa86a5ca91cc5c3edc6265b69c8a812e..8c50e3e54253f69fd701c1bea31c9be11ac1433e 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.conf.in
+++ b/bin/tests/system/xfer/ns6/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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.in
index ac9bd779cd874511385d700330dbb3333012941f..fd0f701101df6a737f9b3477abd5815367158b73 100644 (file)
--- a/bin/tests/system/xfer/ns7/named.conf.in
+++ b/bin/tests/system/xfer/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index 73fba03412dc0394a9e479461f010364fdc22733..8f12a70cb0da5c651bdffd9391d78f6b46890f96 100644 (file)
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 52b1dd7e130ab392ed6ecbe5674657f4aef8ce95..1a8a04bf8db6e51edcc5241e5f9a00e3547adf2a 100644 (file)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index d11da660382a3a7b905da5cc2c972826e21ed558..42fd44c65b986b08f43faac85a3f7678eb1d0515 100755 (executable)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 51241b5906dee1553d4131ada5e7556d95814080..ae2fab6341d3d91dc263ad1a498514cd892d4cf4 100644 (file)
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in
index 424324ea7d9f664b17d78dad149eb942f678ba6a..3cfec8fd931246b2ceaa9efae1d3028ae67a4739 100644 (file)
--- a/bin/tests/system/xferquota/ns1/named.conf.in
+++ b/bin/tests/system/xferquota/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index 5f75c44d637941ee674b8bc4c7c4f6baaaf9fd60..3f4420fbecb7eaf9d537c0db0f29faad4a2e4631 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index 1eff1c22c4f055689541e24a6464a527827b2b7b..dfcde5334e4ebac12bcb9edc49f94f85a898b744 100644 (file)
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index 8ecb4a56b88655ffd008b7352853a42e1c75103b..67aaad7772500903af494bbd848bba04163e44e9 100755 (executable)
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/zero/ans5/ans.pl b/bin/tests/system/zero/ans5/ans.pl
index a146acc0188457ae72bc98cda1c3ba2524946ed1..c796b20b6bdf46886e7bb89532e5f0f927b478e9 100644 (file)
--- a/bin/tests/system/zero/ans5/ans.pl
+++ b/bin/tests/system/zero/ans5/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh
index ea34eeadc636a09024c1e7c549a76312fb6ebc60..4b440b8619ad62877718230f22da928bf6ad0e14 100644 (file)
--- a/bin/tests/system/zero/clean.sh
+++ b/bin/tests/system/zero/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/ns1/named.conf.in b/bin/tests/system/zero/ns1/named.conf.in
index 7b56a8111089954c686010bbf26cc55940bd620f..b3399be321b558cd333c7224036546030f3f2092 100644 (file)
--- a/bin/tests/system/zero/ns1/named.conf.in
+++ b/bin/tests/system/zero/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/ns2/named.conf.in b/bin/tests/system/zero/ns2/named.conf.in
index f36975f7cfd5ffb45ea67159da4c38eee62744af..8d1fe210efd247ba890e92842d270c2532547ba7 100644 (file)
--- a/bin/tests/system/zero/ns2/named.conf.in
+++ b/bin/tests/system/zero/ns2/named.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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/ns3/named.conf.in b/bin/tests/system/zero/ns3/named.conf.in
index e73ee4273bc7cc90338ab0051a5d395603100f73..d75c606d3f6115d33eac9acacb79b56c4bff9a68 100644 (file)
--- a/bin/tests/system/zero/ns3/named.conf.in
+++ b/bin/tests/system/zero/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in
index 0dbb3bc8cd607002f565396e8375b88ea129e92c..344fc5c5bd9d252320316040f9f235923691e869 100644 (file)
--- a/bin/tests/system/zero/ns4/named.conf.in
+++ b/bin/tests/system/zero/ns4/named.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")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index eb1362b9f53e5df138a511220dbf2c90234673c3..f37241a80f2a03f818c1dd95c27a9bf367272851 100644 (file)
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index 4e45608618465870b46e9a52494cabe8879c2d97..6c504fe3dbad4c835aecc086c83eb08d672198f7 100644 (file)
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index 53008d3f76b1f90f27a4f019762c947ba5887f7e..a18b6b0a8105ce98563b32f1b0ff68d3454f4402 100644 (file)
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index 82e318fe5e0573f71f6dd048f9fdc4cbd67f5a77..ff20ec7b026418a163e048d56134e09e1abb2047 100644 (file)
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index f25332cf77932678410ddf1230bcf58ab0398935..7b6720197bbd543921e2133272b8e5f033184945 100644 (file)
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index d9c5771574d6208dff346de8cd2acc101d0520a3..a0b0d84f366acba46594f9b9406e11dd449f9fbb 100644 (file)
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/dns/message.c b/lib/dns/message.c
index fe30a2dd687e5ab768350e55fdd30389c7216c67..6b680ec4f628738d24649faf4555726d0354aab0 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 4b078a31fd8acc37fee313d2612a72714c2a3322..e50b1a6dffa55ed2379be3e62f2d7004638a7259 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index 535b747b46b31473770333fbf42170a478d383d5..4a8ab77f90a4feeabc14c58d0c5e5102c3243bac 100644 (file)
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 938fd39c374d3aa932be51a48bb16856df07e54e..f252b3b7983e52921e98d9b949993fead0070dc9 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/util/copyrights b/util/copyrights
index 07d8d506753a6ee72cf154ec60098dea747d933a..e3db79211721be19cb710f74432513047c8b5938 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -8,7 +8,7 @@
 ./HISTORY                                      X       2010,2013,2017
 ./HISTORY.md                                   MKD     2017
 ./Kyuafile                                     X       2017
-./Makefile.in                                  MAKE    1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
+./Makefile.in                                  MAKE    1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./OPTIONS                                      X       2017
 ./OPTIONS.md                                   MKD     2017
 ./README                                       X       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -580,7 +580,7 @@
 ./bin/tests/master/win32/t_master.vcxproj.in   X       2013,2015,2016,2017
 ./bin/tests/master/win32/t_master.vcxproj.user X       2013
 ./bin/tests/master_test.c                      C       1999,2000,2001,2004,2007,2009,2015
-./bin/tests/mdig.c                             C       2016,2017.2018
+./bin/tests/mdig.c                             C       2016,2017.2018,2018
 ./bin/tests/mem/Makefile.in                    MAKE    1998,1999,2000,2001,2002,2004,2005,2007,2009,2012
 ./bin/tests/mem/t_mem.c                                C       1999,2000,2001,2004,2007,2009,2013,2018
 ./bin/tests/mem/win32/t_mem.dsp.in             X       2013
@@ -704,52 +704,53 @@
 ./bin/tests/startperf/setup.sh                 SH      2011,2012
 ./bin/tests/startperf/smallzone.db             ZONE    2011
 ./bin/tests/sym_test.c                         C       1998,1999,2000,2001,2004,2005,2007,2015
-./bin/tests/system/.gitignore                  X       2012,2014,2016
-./bin/tests/system/Makefile.in                 MAKE    2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016
-./bin/tests/system/README                      TXT.BRIEF       2000,2001,2004,2010,2011,2013,2015
-./bin/tests/system/acl/clean.sh                        SH      2008,2012,2014,2015,2017
-./bin/tests/system/acl/ns2/named1.conf         CONF-C  2008
-./bin/tests/system/acl/ns2/named2.conf         CONF-C  2008
-./bin/tests/system/acl/ns2/named3.conf         CONF-C  2008
-./bin/tests/system/acl/ns2/named4.conf         CONF-C  2008
-./bin/tests/system/acl/ns2/named5.conf         CONF-C  2013
+./bin/tests/system/.gitignore                  X       2012,2014,2016,2018
+./bin/tests/system/Makefile.in                 MAKE    2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/README                      TXT.BRIEF       2000,2001,2004,2010,2011,2013,2015,2018
+./bin/tests/system/acl/clean.sh                        SH      2008,2012,2014,2015,2017,2018
+./bin/tests/system/acl/ns2/named1.conf.in      CONF-C  2008,2018
+./bin/tests/system/acl/ns2/named2.conf.in      CONF-C  2008,2018
+./bin/tests/system/acl/ns2/named3.conf.in      CONF-C  2008,2018
+./bin/tests/system/acl/ns2/named4.conf.in      CONF-C  2008,2018
+./bin/tests/system/acl/ns2/named5.conf.in      CONF-C  2013,2018
 ./bin/tests/system/acl/ns3/example.db          ZONE    2017
-./bin/tests/system/acl/ns3/named.conf          CONF-C  2017
+./bin/tests/system/acl/ns3/named.conf.in       CONF-C  2017,2018
 ./bin/tests/system/acl/ns4/example.db          ZONE    2017
 ./bin/tests/system/acl/ns4/existing.db         ZONE    2017
-./bin/tests/system/acl/ns4/named.conf          CONF-C  2017
-./bin/tests/system/acl/setup.sh                        SH      2008,2012,2014
-./bin/tests/system/acl/tests.sh                        SH      2008,2012,2013,2014,2016,2017
-./bin/tests/system/additional/clean.sh         SH      2013,2017
+./bin/tests/system/acl/ns4/named.conf.in       CONF-C  2017,2018
+./bin/tests/system/acl/setup.sh                        SH      2008,2012,2014,2018
+./bin/tests/system/acl/tests.sh                        SH      2008,2012,2013,2014,2016,2017,2018
+./bin/tests/system/additional/clean.sh         SH      2013,2017,2018
 ./bin/tests/system/additional/ns1/named.args   X       2013
-./bin/tests/system/additional/ns1/named1.conf  CONF-C  2013
-./bin/tests/system/additional/ns1/named2.conf  CONF-C  2013
+./bin/tests/system/additional/ns1/named1.conf.in       CONF-C  2013,2018
+./bin/tests/system/additional/ns1/named2.conf.in       CONF-C  2013,2018
 ./bin/tests/system/additional/ns1/naptr.db     ZONE    2013
 ./bin/tests/system/additional/ns1/naptr2.db    ZONE    2013
 ./bin/tests/system/additional/ns1/nid.db       ZONE    2013
 ./bin/tests/system/additional/ns1/rt.db                ZONE    2013
 ./bin/tests/system/additional/ns1/rt2.db       ZONE    2013
-./bin/tests/system/additional/ns3/named.conf   CONF-C  2017
+./bin/tests/system/additional/ns3/named.conf.in        CONF-C  2017,2018
 ./bin/tests/system/additional/ns3/root.hint    ZONE    2017
-./bin/tests/system/additional/setup.sh         SH      2013
-./bin/tests/system/additional/tests.sh         SH      2013,2016,2017
-./bin/tests/system/addzone/clean.sh            SH      2010,2012,2013,2015,2017
+./bin/tests/system/additional/setup.sh         SH      2013,2018
+./bin/tests/system/additional/tests.sh         SH      2013,2016,2017,2018
+./bin/tests/system/addzone/clean.sh            SH      2010,2012,2013,2015,2017,2018
 ./bin/tests/system/addzone/ns1/inlineslave.db  ZONE    2013
-./bin/tests/system/addzone/ns1/named.conf      CONF-C  2013
+./bin/tests/system/addzone/ns1/named.conf.in   CONF-C  2013,2018
 ./bin/tests/system/addzone/ns2/added.db                ZONE    2010,2013
 ./bin/tests/system/addzone/ns2/default.nzf.in  X       2010
 ./bin/tests/system/addzone/ns2/hints.db                ZONE    2016
 ./bin/tests/system/addzone/ns2/inline.db       ZONE    2013
-./bin/tests/system/addzone/ns2/named1.conf     CONF-C  2010
-./bin/tests/system/addzone/ns2/named2.conf     CONF-C  2010,2011,2016
+./bin/tests/system/addzone/ns2/named1.conf.in  CONF-C  2010,2018
+./bin/tests/system/addzone/ns2/named2.conf.in  CONF-C  2010,2011,2016,2018
 ./bin/tests/system/addzone/ns2/normal.db       ZONE    2010
 ./bin/tests/system/addzone/ns2/previous.db     ZONE    2010
 ./bin/tests/system/addzone/ns2/redirect.db     ZONE    2016
-./bin/tests/system/addzone/ns3/named1.conf     CONF-C  2017
-./bin/tests/system/addzone/ns3/named2.conf     CONF-C  2017
-./bin/tests/system/addzone/setup.sh            SH      2010,2012,2013,2014,2017
-./bin/tests/system/addzone/tests.sh            SH      2010,2011,2012,2013,2015,2016,2017
-./bin/tests/system/allow_query/clean.sh                SH      2010,2012,2015
+./bin/tests/system/addzone/ns3/named1.conf.in  CONF-C  2017,2018
+./bin/tests/system/addzone/ns3/named2.conf.in  CONF-C  2017,2018
+./bin/tests/system/addzone/setup.sh            SH      2010,2012,2013,2014,2017,2018
+./bin/tests/system/addzone/tests.sh            SH      2010,2011,2012,2013,2015,2016,2017,2018
+./bin/tests/system/allow_query/.gitignore      X       2018
+./bin/tests/system/allow_query/clean.sh                SH      2010,2012,2015,2018
 ./bin/tests/system/allow_query/ns2/aclallow.db ZONE    2010
 ./bin/tests/system/allow_query/ns2/acldisallow.db      ZONE    2010
 ./bin/tests/system/allow_query/ns2/aclnotallow.db      ZONE    2010
@@ -760,47 +761,47 @@
 ./bin/tests/system/allow_query/ns2/any.db      ZONE    2010
 ./bin/tests/system/allow_query/ns2/keyallow.db ZONE    2010
 ./bin/tests/system/allow_query/ns2/keydisallow.db      ZONE    2010
-./bin/tests/system/allow_query/ns2/named01.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named02.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named03.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named04.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named05.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named06.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named07.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named08.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named09.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named10.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named11.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named12.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named21.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named22.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named23.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named24.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named25.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named26.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named27.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named28.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named29.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named30.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named31.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named32.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named33.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named34.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named40.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named53.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named54.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named55.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named56.conf        CONF-C  2010
-./bin/tests/system/allow_query/ns2/named57.conf        CONF-C  2013
+./bin/tests/system/allow_query/ns2/named01.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named02.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named03.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named04.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named05.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named06.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named07.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named08.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named09.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named10.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named11.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named12.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named21.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named22.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named23.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named24.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named25.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named26.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named27.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named28.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named29.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named30.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named31.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named32.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named33.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named34.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named40.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named53.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named54.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named55.conf.in     CONF-C  2018
+./bin/tests/system/allow_query/ns2/named56.conf.in     CONF-C  2010,2018
+./bin/tests/system/allow_query/ns2/named57.conf.in     CONF-C  2018
 ./bin/tests/system/allow_query/ns2/none.db     ZONE    2010
 ./bin/tests/system/allow_query/ns2/normal.db   ZONE    2010
 ./bin/tests/system/allow_query/ns2/previous.db ZONE    2010
-./bin/tests/system/allow_query/setup.sh                SH      2010,2012
-./bin/tests/system/allow_query/tests.sh                SH      2010,2012,2013,2016
-./bin/tests/system/ans.pl                      PERL    2011,2012,2014,2017
-./bin/tests/system/autosign/clean.sh           SH      2009,2010,2011,2012,2013,2014,2015,2017
+./bin/tests/system/allow_query/setup.sh                SH      2010,2012,2018
+./bin/tests/system/allow_query/tests.sh                SH      2010,2012,2013,2016,2018
+./bin/tests/system/ans.pl                      PERL    2011,2012,2014,2017,2018
+./bin/tests/system/autosign/clean.sh           SH      2009,2010,2011,2012,2013,2014,2015,2017,2018
 ./bin/tests/system/autosign/ns1/keygen.sh      SH      2009,2010,2011,2012,2014
-./bin/tests/system/autosign/ns1/named.conf     CONF-C  2009
+./bin/tests/system/autosign/ns1/named.conf.in  CONF-C  2009,2018
 ./bin/tests/system/autosign/ns1/root.db.in     ZONE    2009,2010
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.key    X       2010
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.private        X       2010
@@ -813,7 +814,7 @@
 ./bin/tests/system/autosign/ns2/example.db.in  ZONE    2009,2010
 ./bin/tests/system/autosign/ns2/insecure.secure.example.db     ZONE    2009
 ./bin/tests/system/autosign/ns2/keygen.sh      SH      2009,2010,2011,2012,2014
-./bin/tests/system/autosign/ns2/named.conf     CONF-C  2009,2010,2011
+./bin/tests/system/autosign/ns2/named.conf.in  CONF-C  2009,2010,2011,2018
 ./bin/tests/system/autosign/ns2/private.secure.example.db.in   ZONE    2009
 ./bin/tests/system/autosign/ns3/autonsec3.example.db.in        ZONE    2011
 ./bin/tests/system/autosign/ns3/delay.example.db       ZONE    2011
@@ -824,7 +825,7 @@
 ./bin/tests/system/autosign/ns3/inaczsk3.example.db.in ZONE    2017
 ./bin/tests/system/autosign/ns3/insecure.example.db    ZONE    2009
 ./bin/tests/system/autosign/ns3/keygen.sh      SH      2009,2010,2011,2012,2014,2017
-./bin/tests/system/autosign/ns3/named.conf     CONF-C  2009,2010,2011,2012,2017
+./bin/tests/system/autosign/ns3/named.conf.in  CONF-C  2009,2010,2011,2012,2017,2018
 ./bin/tests/system/autosign/ns3/nozsk.example.db.in    ZONE    2011
 ./bin/tests/system/autosign/ns3/nsec.example.db.in     ZONE    2010
 ./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in    ZONE    2010
@@ -846,49 +847,46 @@
 ./bin/tests/system/autosign/ns3/ttl2.example.db.in     ZONE    2011
 ./bin/tests/system/autosign/ns3/ttl3.example.db.in     ZONE    2011
 ./bin/tests/system/autosign/ns3/ttl4.example.db.in     ZONE    2011
-./bin/tests/system/autosign/ns4/named.conf     CONF-C  2009
-./bin/tests/system/autosign/ns5/named.conf     CONF-C  2009
+./bin/tests/system/autosign/ns4/named.conf.in  CONF-C  2009,2018
+./bin/tests/system/autosign/ns5/named.conf.in  CONF-C  2009,2018
 ./bin/tests/system/autosign/prereq.sh          SH      2009,2010,2012,2014
-./bin/tests/system/autosign/setup.sh           SH      2009,2010,2012,2014
-./bin/tests/system/autosign/tests.sh           SH      2009,2010,2011,2012,2013,2014,2016,2017
-./bin/tests/system/builtin/clean.sh            SH      2014
-./bin/tests/system/builtin/ns1/named.conf      CONF-C  2011
-./bin/tests/system/builtin/ns2/named.conf      CONF-C  2014
-./bin/tests/system/builtin/ns3/named.conf      CONF-C  2014
-./bin/tests/system/builtin/tests.sh            SH      2011,2012,2014,2015,2016
-./bin/tests/system/cacheclean/clean.sh         SH      2001,2004,2007,2011,2012,2015
+./bin/tests/system/autosign/setup.sh           SH      2009,2010,2012,2014,2018
+./bin/tests/system/autosign/tests.sh           SH      2009,2010,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/builtin/clean.sh            SH      2014,2018
+./bin/tests/system/builtin/ns1/named.conf.in   CONF-C  2011,2018
+./bin/tests/system/builtin/ns2/named.conf.in   CONF-C  2014,2018
+./bin/tests/system/builtin/ns3/named.conf.in   CONF-C  2014,2018
+./bin/tests/system/builtin/setup.sh            SH      2018
+./bin/tests/system/builtin/tests.sh            SH      2011,2012,2014,2015,2016,2018
+./bin/tests/system/cacheclean/clean.sh         SH      2001,2004,2007,2011,2012,2015,2018
 ./bin/tests/system/cacheclean/dig.batch                X       2001
 ./bin/tests/system/cacheclean/knowngood.dig.out        X       2001
 ./bin/tests/system/cacheclean/ns1/example.db   ZONE    2001,2004,2007,2012
 ./bin/tests/system/cacheclean/ns1/flushtest.db ZONE    2011
-./bin/tests/system/cacheclean/ns1/named.conf   CONF-C  2001,2004,2005,2007,2011
-./bin/tests/system/cacheclean/ns2/named.conf   CONF-C  2001,2004,2005,2007,2011
-./bin/tests/system/cacheclean/tests.sh         SH      2001,2004,2007,2011,2012,2013,2016
-./bin/tests/system/case/clean.sh               SH      2013,2014,2015
-./bin/tests/system/case/ns1/example.db         ZONE    2013
-./bin/tests/system/case/ns1/named.conf         CONF-C  2013
-./bin/tests/system/case/ns2/named.conf         CONF-C  2014
-./bin/tests/system/case/tests.sh               SH      2013,2014,2016
+./bin/tests/system/cacheclean/ns1/named.conf.in        CONF-C  2001,2004,2005,2007,2011,2018
+./bin/tests/system/cacheclean/ns2/named.conf.in        CONF-C  2001,2004,2005,2007,2011,2018
+./bin/tests/system/cacheclean/setup.sh         SH      2018
+./bin/tests/system/cacheclean/tests.sh         SH      2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/chain/README                        TXT.BRIEF       2017
-./bin/tests/system/chain/ans3/ans.pl           PERL    2017
+./bin/tests/system/chain/ans3/ans.pl           PERL    2017,2018
 ./bin/tests/system/chain/ans4/.gitignore       X       2017
-./bin/tests/system/chain/ans4/README.anspy     TXT.BRIEF       2017
-./bin/tests/system/chain/ans4/ans.py           PYTHON  2017
-./bin/tests/system/chain/clean.sh              SH      2011,2012,2014,2015,2016,2017
-./bin/tests/system/chain/ns1/named.conf                CONF-C  2011,2016,2017
+./bin/tests/system/chain/ans4/README.anspy     TXT.BRIEF       2017,2018
+./bin/tests/system/chain/ans4/ans.py           PYTHON  2017,2018
+./bin/tests/system/chain/clean.sh              SH      2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/chain/ns1/named.conf.in     CONF-C  2011,2016,2017,2018
 ./bin/tests/system/chain/ns1/root.db           ZONE    2011,2016,2017
 ./bin/tests/system/chain/ns2/example.db                ZONE    2011,2016,2017
 ./bin/tests/system/chain/ns2/generic.db                ZONE    2017
-./bin/tests/system/chain/ns2/named.conf                CONF-C  2011,2016,2017
+./bin/tests/system/chain/ns2/named.conf.in     CONF-C  2011,2016,2017,2018
 ./bin/tests/system/chain/ns2/sign.sh           SH      2017
 ./bin/tests/system/chain/ns2/sub.db            ZONE    2017
-./bin/tests/system/chain/ns5/named.conf                CONF-C  2017
+./bin/tests/system/chain/ns5/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/chain/ns5/sub.db            ZONE    2017
-./bin/tests/system/chain/ns7/named.conf                CONF-C  2017
+./bin/tests/system/chain/ns7/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/chain/ns7/root.hint         ZONE    2017
-./bin/tests/system/chain/prereq.sh             SH      2017
-./bin/tests/system/chain/setup.sh              SH      2017
-./bin/tests/system/chain/tests.sh              SH      2011,2012,2016,2017
+./bin/tests/system/chain/prereq.sh             SH      2017,2018
+./bin/tests/system/chain/setup.sh              SH      2017,2018
+./bin/tests/system/chain/tests.sh              SH      2011,2012,2016,2017,2018
 ./bin/tests/system/checkconf/altdb.conf                CONF-C  2014
 ./bin/tests/system/checkconf/bad-also-notify.conf      CONF-C  2012,2013
 ./bin/tests/system/checkconf/bad-dnssec.conf   CONF-C  2012,2013
@@ -989,30 +987,30 @@
 ./bin/tests/system/checkds/ok.example.dnskey.db        X       2012
 ./bin/tests/system/checkds/ok.example.ds.db    X       2012
 ./bin/tests/system/checkds/setup.sh            SH      2012,2013,2014
-./bin/tests/system/checkds/tests.sh            SH      2012,2013,2014,2016
+./bin/tests/system/checkds/tests.sh            SH      2012,2013,2014,2016,2018
 ./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db    X       2012
 ./bin/tests/system/checkds/wrong.example.dnskey.db     X       2012
 ./bin/tests/system/checkds/wrong.example.ds.db X       2012
-./bin/tests/system/checknames/clean.sh         SH      2004,2007,2012,2014,2015
+./bin/tests/system/checknames/clean.sh         SH      2004,2007,2012,2014,2015,2018
 ./bin/tests/system/checknames/ns1/fail.example.db.in   ZONE    2004,2007
 ./bin/tests/system/checknames/ns1/fail.update.db.in    ZONE    2004,2007
 ./bin/tests/system/checknames/ns1/ignore.example.db.in ZONE    2004,2007
 ./bin/tests/system/checknames/ns1/ignore.update.db.in  ZONE    2004,2007
-./bin/tests/system/checknames/ns1/named.conf   CONF-C  2004,2005,2007
+./bin/tests/system/checknames/ns1/named.conf.in        CONF-C  2004,2005,2007,2018
 ./bin/tests/system/checknames/ns1/root.db      ZONE    2004,2007
 ./bin/tests/system/checknames/ns1/warn.example.db.in   ZONE    2004,2007
 ./bin/tests/system/checknames/ns1/warn.update.db.in    ZONE    2004,2007
-./bin/tests/system/checknames/ns2/named.conf   CONF-C  2004,2007
+./bin/tests/system/checknames/ns2/named.conf.in        CONF-C  2004,2007,2018
 ./bin/tests/system/checknames/ns2/root.hints   ZONE    2004,2007
-./bin/tests/system/checknames/ns3/named.conf   CONF-C  2004,2007
+./bin/tests/system/checknames/ns3/named.conf.in        CONF-C  2004,2007,2018
 ./bin/tests/system/checknames/ns3/root.hints   ZONE    2004,2007
 ./bin/tests/system/checknames/ns4/master-ignore.update.db.in   ZONE    2014
-./bin/tests/system/checknames/ns4/named.conf   CONF-C  2014
+./bin/tests/system/checknames/ns4/named.conf.in        CONF-C  2014,2018
 ./bin/tests/system/checknames/ns4/root.hints   ZONE    2014
-./bin/tests/system/checknames/setup.sh         SH      2004,2007,2012,2014
-./bin/tests/system/checknames/tests.sh         SH      2004,2007,2012,2014,2016
+./bin/tests/system/checknames/setup.sh         SH      2004,2007,2012,2014,2018
+./bin/tests/system/checknames/tests.sh         SH      2004,2007,2012,2014,2016,2018
 ./bin/tests/system/checkzone/clean.sh          SH      2011,2012,2015
-./bin/tests/system/checkzone/tests.sh          SH      2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/checkzone/tests.sh          SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/checkzone/zones/.gitattributes      X       2015
 ./bin/tests/system/checkzone/zones/bad-badclass.raw    X       2015
 ./bin/tests/system/checkzone/zones/bad-caa-rr.db       ZONE    2015
@@ -1045,14 +1043,15 @@
 ./bin/tests/system/checkzone/zones/spf.db      ZONE    2013
 ./bin/tests/system/checkzone/zones/warn.inherit.origin.db      ZONE    2014
 ./bin/tests/system/checkzone/zones/warn.inherited.owner.db     ZONE    2014
-./bin/tests/system/clean.sh                    SH      2015
-./bin/tests/system/cleanall.sh                 SH      2000,2001,2004,2007,2012,2014,2015
+./bin/tests/system/clean.sh                    SH      2015,2018
+./bin/tests/system/cleanall.sh                 SH      2000,2001,2004,2007,2012,2014,2015,2018
 ./bin/tests/system/cleanpkcs11.sh              SH      2010,2012
-./bin/tests/system/common/controls.conf                CONF-C  2000,2001,2004,2007
+./bin/tests/system/common/controls.conf                CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/common/controls.conf.in     CONF-C  2018
 ./bin/tests/system/common/rndc.conf            CONF-C  2000,2001,2004,2007
 ./bin/tests/system/common/rndc.key             CONF-C  2011
 ./bin/tests/system/common/root.hint            ZONE    2000,2001,2004,2007
-./bin/tests/system/conf.sh.in                  SH      2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/conf.sh.in                  SH      2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/coverage/01-ksk-inactive/README     X       2013
 ./bin/tests/system/coverage/01-ksk-inactive/expect     X       2013
 ./bin/tests/system/coverage/02-zsk-inactive/README     X       2013
@@ -1070,14 +1069,14 @@
 ./bin/tests/system/coverage/08-zsk-ttl/README  X       2013
 ./bin/tests/system/coverage/08-zsk-ttl/expect  X       2013,2016
 ./bin/tests/system/coverage/clean.sh           SH      2013,2014,2016
-./bin/tests/system/coverage/prereq.sh          SH      2014
+./bin/tests/system/coverage/prereq.sh          SH      2014,2018
 ./bin/tests/system/coverage/setup.sh           SH      2013,2014
-./bin/tests/system/coverage/tests.sh           SH      2013,2016
-./bin/tests/system/database/clean.sh           SH      2011,2012
-./bin/tests/system/database/ns1/named.conf1    CONF-C  2011
-./bin/tests/system/database/ns1/named.conf2    CONF-C  2011
-./bin/tests/system/database/setup.sh           SH      2011,2012
-./bin/tests/system/database/tests.sh           SH      2011,2012,2016
+./bin/tests/system/coverage/tests.sh           SH      2013,2016,2018
+./bin/tests/system/database/clean.sh           SH      2011,2012,2018
+./bin/tests/system/database/ns1/named1.conf.in CONF-C  2011,2018
+./bin/tests/system/database/ns1/named2.conf.in CONF-C  2011,2018
+./bin/tests/system/database/setup.sh           SH      2011,2012,2018
+./bin/tests/system/database/tests.sh           SH      2011,2012,2016,2018
 ./bin/tests/system/dialup/ns1/example.db       ZONE    2000,2001,2004,2007
 ./bin/tests/system/dialup/ns1/named.conf       CONF-C  2000,2001,2004,2007
 ./bin/tests/system/dialup/ns1/root.db          ZONE    2000,2001,2004,2007
@@ -1089,44 +1088,45 @@
 ./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016
 ./bin/tests/system/digcomp.pl                  PERL    2000,2001,2004,2007,2012,2013,2016
 ./bin/tests/system/digdelv/ans4/startme                X       2017
-./bin/tests/system/digdelv/clean.sh            SH      2015,2016
-./bin/tests/system/digdelv/ns1/named.conf      CONF-C  2015
+./bin/tests/system/digdelv/clean.sh            SH      2015,2016,2018
+./bin/tests/system/digdelv/ns1/named.conf.in   CONF-C  2015,2018
 ./bin/tests/system/digdelv/ns1/root.db         ZONE    2015
 ./bin/tests/system/digdelv/ns2/example.db      ZONE    2015,2016
-./bin/tests/system/digdelv/ns2/named.conf      CONF-C  2015
-./bin/tests/system/digdelv/ns3/named.conf      CONF-C  2015
-./bin/tests/system/digdelv/tests.sh            SH      2015,2016,2017
+./bin/tests/system/digdelv/ns2/named.conf.in   CONF-C  2015,2018
+./bin/tests/system/digdelv/ns3/named.conf.in   CONF-C  2015,2018
+./bin/tests/system/digdelv/setup.sh            SH      2018
+./bin/tests/system/digdelv/tests.sh            SH      2015,2016,2017,2018
 ./bin/tests/system/ditch.pl                    PERL    2015
-./bin/tests/system/dlv/clean.sh                        SH      2004,2007,2010,2011,2012,2014
-./bin/tests/system/dlv/ns1/named.conf          CONF-C  2004,2007,2011
-./bin/tests/system/dlv/ns1/root.db.in          ZONE    2011
-./bin/tests/system/dlv/ns1/rootservers.utld.db ZONE    2004,2007
-./bin/tests/system/dlv/ns1/sign.sh             SH      2011,2012,2014
-./bin/tests/system/dlv/ns2/druz.db.in          ZONE    2011
-./bin/tests/system/dlv/ns2/hints               ZONE    2004,2007
-./bin/tests/system/dlv/ns2/named.conf          CONF-C  2004,2007,2011
-./bin/tests/system/dlv/ns2/sign.sh             SH      2011,2012,2014
-./bin/tests/system/dlv/ns2/utld.db             ZONE    2004,2007
-./bin/tests/system/dlv/ns3/child.db.in         ZONE    2004,2007,2010
-./bin/tests/system/dlv/ns3/dlv.db.in           ZONE    2004,2007
-./bin/tests/system/dlv/ns3/hints               ZONE    2004,2007
-./bin/tests/system/dlv/ns3/named.conf          CONF-C  2004,2007,2011
-./bin/tests/system/dlv/ns3/sign.sh             SH      2004,2007,2009,2010,2011,2012,2014
-./bin/tests/system/dlv/ns4/child.db            ZONE    2004,2007
-./bin/tests/system/dlv/ns4/hints               ZONE    2004,2007
-./bin/tests/system/dlv/ns4/named.conf          CONF-C  2004,2007
-./bin/tests/system/dlv/ns5/hints               ZONE    2004,2007
-./bin/tests/system/dlv/ns5/named.conf          CONF-C  2004,2006,2007,2011
-./bin/tests/system/dlv/ns5/rndc.conf           CONF-C  2004,2007
-./bin/tests/system/dlv/ns6/child.db.in         ZONE    2010
-./bin/tests/system/dlv/ns6/hints               ZONE    2010
-./bin/tests/system/dlv/ns6/named.conf          CONF-C  2010,2011
-./bin/tests/system/dlv/ns6/sign.sh             SH      2010,2011,2012,2014
-./bin/tests/system/dlv/prereq.sh               SH      2014
-./bin/tests/system/dlv/setup.sh                        SH      2004,2007,2009,2011,2012,2014
-./bin/tests/system/dlv/tests.sh                        SH      2004,2007,2010,2011,2012,2016
+./bin/tests/system/dlv/clean.sh                        SH      2004,2007,2010,2011,2012,2014,2018
+./bin/tests/system/dlv/ns1/named.conf.in       CONF-C  2004,2007,2011,2018
+./bin/tests/system/dlv/ns1/root.db.in          ZONE    2011,2018
+./bin/tests/system/dlv/ns1/rootservers.utld.db ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns1/sign.sh             SH      2011,2012,2014,2018
+./bin/tests/system/dlv/ns2/druz.db.in          ZONE    2011,2018
+./bin/tests/system/dlv/ns2/hints               ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns2/named.conf.in       CONF-C  2004,2007,2011,2018
+./bin/tests/system/dlv/ns2/sign.sh             SH      2011,2012,2014,2018
+./bin/tests/system/dlv/ns2/utld.db             ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns3/child.db.in         ZONE    2004,2007,2010,2018
+./bin/tests/system/dlv/ns3/dlv.db.in           ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns3/hints               ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns3/named.conf.in       CONF-C  2004,2007,2011,2018
+./bin/tests/system/dlv/ns3/sign.sh             SH      2004,2007,2009,2010,2011,2012,2014,2018
+./bin/tests/system/dlv/ns4/child.db            ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns4/hints               ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns4/named.conf.in       CONF-C  2004,2007,2018
+./bin/tests/system/dlv/ns5/hints               ZONE    2004,2007,2018
+./bin/tests/system/dlv/ns5/named.conf.in       CONF-C  2004,2006,2007,2011,2018
+./bin/tests/system/dlv/ns5/rndc.conf           CONF-C  2004,2007,2018
+./bin/tests/system/dlv/ns6/child.db.in         ZONE    2010,2018
+./bin/tests/system/dlv/ns6/hints               ZONE    2010,2018
+./bin/tests/system/dlv/ns6/named.conf.in       CONF-C  2010,2011,2018
+./bin/tests/system/dlv/ns6/sign.sh             SH      2010,2011,2012,2014,2018
+./bin/tests/system/dlv/prereq.sh               SH      2014,2018
+./bin/tests/system/dlv/setup.sh                        SH      2004,2007,2009,2011,2012,2014,2018
+./bin/tests/system/dlv/tests.sh                        SH      2004,2007,2010,2011,2012,2016,2018
 ./bin/tests/system/dlz/.gitignore              X       2012
-./bin/tests/system/dlz/clean.sh                        SH      2010,2012
+./bin/tests/system/dlz/clean.sh                        SH      2010,2012,2018
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=  TXT.BRIEF       2015
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=     TXT.BRIEF       2015
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=      TXT.BRIEF       2015
@@ -1134,19 +1134,21 @@
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=    TXT.BRIEF       2010
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=  TXT.BRIEF       2010
 ./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1        TXT.BRIEF       2010
-./bin/tests/system/dlz/ns1/named.conf          CONF-C  2010
-./bin/tests/system/dlz/prereq.sh.in            SH      2011,2012
-./bin/tests/system/dlz/tests.sh                        SH      2010,2011,2012,2013,2015,2016
+./bin/tests/system/dlz/ns1/named.conf.in       CONF-C  2010,2018
+./bin/tests/system/dlz/prereq.sh.in            SH      2011,2012,2018
+./bin/tests/system/dlz/setup.sh                        SH      2018
+./bin/tests/system/dlz/tests.sh                        SH      2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/dlzexternal/Makefile.in     MAKE    2011,2012,2014,2015,2016,2017
-./bin/tests/system/dlzexternal/clean.sh                X       2010,2014,2015
+./bin/tests/system/dlzexternal/clean.sh                X       2010,2014,2015,2018
 ./bin/tests/system/dlzexternal/driver.c                C       2011,2012,2013,2014,2015,2017
 ./bin/tests/system/dlzexternal/driver.h                C       2011
-./bin/tests/system/dlzexternal/ns1/.gitignore  X       2012
-./bin/tests/system/dlzexternal/ns1/named.conf.in       CONF-C  2011
-./bin/tests/system/dlzexternal/prereq.sh       SH      2010,2011,2012,2014,2016
-./bin/tests/system/dlzexternal/setup.sh                SH      2010,2012,2014
-./bin/tests/system/dlzexternal/tests.sh                X       2010,2011,2012,2013,2016
-./bin/tests/system/dns64/clean.sh              SH      2010,2012,2014,2015
+./bin/tests/system/dlzexternal/ns1/.gitignore  X       2012,2018
+./bin/tests/system/dlzexternal/ns1/dlzs.conf.in        CONF-C  2018
+./bin/tests/system/dlzexternal/ns1/named.conf.in       CONF-C  2011,2018
+./bin/tests/system/dlzexternal/prereq.sh       SH      2010,2011,2012,2014,2016,2018
+./bin/tests/system/dlzexternal/setup.sh                SH      2010,2012,2014,2018
+./bin/tests/system/dlzexternal/tests.sh                X       2010,2011,2012,2013,2016,2018
+./bin/tests/system/dns64/clean.sh              SH      2010,2012,2014,2015,2018
 ./bin/tests/system/dns64/conf/bad1.conf                CONF-C  2010
 ./bin/tests/system/dns64/conf/bad2.conf                CONF-C  2010
 ./bin/tests/system/dns64/conf/bad3.conf                CONF-C  2010
@@ -1162,18 +1164,18 @@
 ./bin/tests/system/dns64/conf/good4.conf       CONF-C  2010
 ./bin/tests/system/dns64/conf/good5.conf       CONF-C  2010
 ./bin/tests/system/dns64/ns1/example.db                ZONE    2010,2011,2013,2016
-./bin/tests/system/dns64/ns1/named.conf                CONF-C  2010
+./bin/tests/system/dns64/ns1/named.conf.in     CONF-C  2010,2018
 ./bin/tests/system/dns64/ns1/root.db           ZONE    2010
 ./bin/tests/system/dns64/ns1/sign.sh           SH      2010,2012,2014
-./bin/tests/system/dns64/ns2/named.conf                CONF-C  2010,2011,2013,2016
+./bin/tests/system/dns64/ns2/named.conf.in     CONF-C  2010,2011,2013,2016,2018
 ./bin/tests/system/dns64/ns2/rpz.db            ZONE    2013
 ./bin/tests/system/dns64/prereq.sh             SH      2014
-./bin/tests/system/dns64/setup.sh              SH      2010,2012,2014
-./bin/tests/system/dns64/tests.sh              SH      2010,2011,2012,2013,2014,2016
+./bin/tests/system/dns64/setup.sh              SH      2010,2012,2014,2018
+./bin/tests/system/dns64/tests.sh              SH      2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/README               TXT.BRIEF       2000,2001,2002,2004,2011
-./bin/tests/system/dnssec/clean.sh             SH      2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/dnssec/dnssec_update_test.pl        PERL    2002,2004,2007,2010,2012
-./bin/tests/system/dnssec/ns1/named.conf       CONF-C  2000,2001,2004,2006,2007
+./bin/tests/system/dnssec/clean.sh             SH      2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/dnssec/dnssec_update_test.pl        PERL    2002,2004,2007,2010,2012,2018
+./bin/tests/system/dnssec/ns1/named.conf.in    CONF-C  2000,2001,2004,2006,2007,2018
 ./bin/tests/system/dnssec/ns1/root.db.in       ZONE    2000,2001,2004,2007,2010,2013,2014
 ./bin/tests/system/dnssec/ns1/sign.sh          SH      2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./bin/tests/system/dnssec/ns2/algroll.db.in    ZONE    2010
@@ -1191,7 +1193,7 @@
 ./bin/tests/system/dnssec/ns2/example.db.in    ZONE    2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016
 ./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in       ZONE    2014
 ./bin/tests/system/dnssec/ns2/insecure.secure.example.db       ZONE    2000,2001,2004,2007,2013
-./bin/tests/system/dnssec/ns2/named.conf       CONF-C  2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015
+./bin/tests/system/dnssec/ns2/named.conf.in    CONF-C  2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015,2018
 ./bin/tests/system/dnssec/ns2/private.secure.example.db.in     ZONE    2000,2001,2004,2007
 ./bin/tests/system/dnssec/ns2/rfc2335.example.db       X       2004
 ./bin/tests/system/dnssec/ns2/sign.sh          SH      2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016
@@ -1215,7 +1217,7 @@
 ./bin/tests/system/dnssec/ns3/lower.example.db.in      ZONE    2012
 ./bin/tests/system/dnssec/ns3/managed-future.example.db.in     ZONE    2016
 ./bin/tests/system/dnssec/ns3/multiple.example.db.in   ZONE    2006,2008
-./bin/tests/system/dnssec/ns3/named.conf       CONF-C  2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016
+./bin/tests/system/dnssec/ns3/named.conf.in    CONF-C  2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/ns3/nosign.example.db.in     ZONE    2011
 ./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in      ZONE    2006,2008
 ./bin/tests/system/dnssec/ns3/nsec3.example.db.in      ZONE    2006,2008
@@ -1241,32 +1243,31 @@
 ./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in   ZONE    2011
 ./bin/tests/system/dnssec/ns3/update-nsec3.example.db.in       ZONE    2011
 ./bin/tests/system/dnssec/ns3/upper.example.db.in      ZONE    2012
-./bin/tests/system/dnssec/ns4/named1.conf      CONF-C  2011
-./bin/tests/system/dnssec/ns4/named2.conf      CONF-C  2011
-./bin/tests/system/dnssec/ns4/named3.conf      CONF-C  2012
-./bin/tests/system/dnssec/ns4/named4.conf      CONF-C  2013,2017
-./bin/tests/system/dnssec/ns4/named5.conf      CONF-C  2017
+./bin/tests/system/dnssec/ns4/named1.conf.in   CONF-C  2011,2018
+./bin/tests/system/dnssec/ns4/named2.conf.in   CONF-C  2011,2018
+./bin/tests/system/dnssec/ns4/named3.conf.in   CONF-C  2012,2018
+./bin/tests/system/dnssec/ns4/named4.conf.in   CONF-C  2013,2017,2018
+./bin/tests/system/dnssec/ns4/named5.conf.in   CONF-C  2017,2018
 ./bin/tests/system/dnssec/ns5/.gitignore       X       2015
-./bin/tests/system/dnssec/ns5/named1.conf      CONF-C  2000,2001,2004,2006,2007,2015
-./bin/tests/system/dnssec/ns5/named2.conf      CONF-C  2000,2001,2004,2006,2007,2015
+./bin/tests/system/dnssec/ns5/named1.conf.in   CONF-C  2000,2001,2004,2006,2007,2015,2018
+./bin/tests/system/dnssec/ns5/named2.conf.in   CONF-C  2000,2001,2004,2006,2007,2015,2018
 ./bin/tests/system/dnssec/ns5/sign.sh          SH      2015
 ./bin/tests/system/dnssec/ns5/trusted.conf.bad CONF-C  2000,2001,2004,2007
 ./bin/tests/system/dnssec/ns6/named.args       X       2013
-./bin/tests/system/dnssec/ns6/named.conf       CONF-C  2004,2006,2007,2013
+./bin/tests/system/dnssec/ns6/named.conf.in    CONF-C  2004,2006,2007,2013,2018
 ./bin/tests/system/dnssec/ns6/optout-tld.db.in ZONE    2013
 ./bin/tests/system/dnssec/ns6/sign.sh          SH      2013,2014
-./bin/tests/system/dnssec/ns7/named.conf       CONF-C  2006,2008,2010,2014
+./bin/tests/system/dnssec/ns7/named.conf.in    CONF-C  2006,2008,2010,2014,2018
 ./bin/tests/system/dnssec/ns7/named.nosoa      TXT.BRIEF       2010
 ./bin/tests/system/dnssec/ns7/nosoa.secure.example.db  ZONE    2010
 ./bin/tests/system/dnssec/ns7/sign.sh          SH      2014
 ./bin/tests/system/dnssec/ns7/split-rrsig.db.in        ZONE    2014
-./bin/tests/system/dnssec/prereq.sh            SH      2000,2001,2002,2004,2006,2007,2009,2012,2014,2015
-./bin/tests/system/dnssec/setup.sh             SH      2000,2001,2004,2007,2009,2011,2012,2013,2014,2015
+./bin/tests/system/dnssec/prereq.sh            SH      2000,2001,2002,2004,2006,2007,2009,2012,2014,2015,2018
+./bin/tests/system/dnssec/setup.sh             SH      2000,2001,2004,2007,2009,2011,2012,2013,2014,2015,2018
 ./bin/tests/system/dnssec/signer/example.db.in ZONE    2010
 ./bin/tests/system/dnssec/signer/remove.db.in  ZONE    2016
 ./bin/tests/system/dnssec/signer/remove2.db.in ZONE    2016
-./bin/tests/system/dnssec/tests.sh             SH      2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/dsdigest/prereq.sh          SH      2014
+./bin/tests/system/dnssec/tests.sh             SH      2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/ecdsa/clean.sh              SH      2012,2014
 ./bin/tests/system/ecdsa/ns1/named.conf                CONF-C  2012
 ./bin/tests/system/ecdsa/ns1/root.db.in                ZONE    2012
@@ -1291,40 +1292,28 @@
 ./bin/tests/system/eddsa/tests.sh              SH      2017
 ./bin/tests/system/emptyzones/clean.sh         SH      2014,2015
 ./bin/tests/system/emptyzones/ns1/empty.db     ZONE    2014
-./bin/tests/system/emptyzones/ns1/named1.conf  CONF-C  2014
-./bin/tests/system/emptyzones/ns1/named2.conf  CONF-C  2014,2015
+./bin/tests/system/emptyzones/ns1/named1.conf.in       CONF-C  2014,2018
+./bin/tests/system/emptyzones/ns1/named2.conf.in       CONF-C  2014,2015,2018
 ./bin/tests/system/emptyzones/ns1/rfc1918.zones        CONF-C  2014
 ./bin/tests/system/emptyzones/ns1/root.hint    ZONE    2014
-./bin/tests/system/emptyzones/setup.sh         SH      2014
-./bin/tests/system/emptyzones/tests.sh         SH      2014,2015,2016
+./bin/tests/system/emptyzones/setup.sh         SH      2014,2018
+./bin/tests/system/emptyzones/tests.sh         SH      2014,2015,2016,2018
 ./bin/tests/system/feature-test.c              C       2016
-./bin/tests/system/fetchlimit/ans4/ans.pl      PERL    2015
-./bin/tests/system/fetchlimit/clean.sh         SH      2015
-./bin/tests/system/fetchlimit/lameserver/ans4/ans.pl   PERL    2015
-./bin/tests/system/fetchlimit/lameserver/clean.sh      SH      2015
-./bin/tests/system/fetchlimit/lameserver/ns1/named.conf        CONF-C  2015
-./bin/tests/system/fetchlimit/lameserver/ns1/root.db   ZONE    2015
-./bin/tests/system/fetchlimit/lameserver/ns2/example.db        ZONE    2015
-./bin/tests/system/fetchlimit/lameserver/ns2/named.conf        CONF-C  2015
-./bin/tests/system/fetchlimit/lameserver/ns3/named1.conf       CONF-C  2015
-./bin/tests/system/fetchlimit/lameserver/ns3/named2.conf       CONF-C  2015
-./bin/tests/system/fetchlimit/lameserver/ns3/named3.conf       CONF-C  2015
-./bin/tests/system/fetchlimit/lameserver/ns3/root.hint ZONE    2015
-./bin/tests/system/fetchlimit/lameserver/setup.sh      SH      2015
-./bin/tests/system/fetchlimit/lameserver/tests.sh      SH      2015
-./bin/tests/system/fetchlimit/ns1/named.conf   CONF-C  2015
+./bin/tests/system/fetchlimit/ans4/ans.pl      PERL    2015,2018
+./bin/tests/system/fetchlimit/clean.sh         SH      2015,2018
+./bin/tests/system/fetchlimit/ns1/named.conf.in        CONF-C  2015,2018
 ./bin/tests/system/fetchlimit/ns1/root.db      ZONE    2015
 ./bin/tests/system/fetchlimit/ns2/example.db   ZONE    2015
-./bin/tests/system/fetchlimit/ns2/named.conf   CONF-C  2015
+./bin/tests/system/fetchlimit/ns2/named.conf.in        CONF-C  2015,2018
 ./bin/tests/system/fetchlimit/ns3/named.args   X       2015
-./bin/tests/system/fetchlimit/ns3/named1.conf  CONF-C  2015
-./bin/tests/system/fetchlimit/ns3/named2.conf  CONF-C  2015
-./bin/tests/system/fetchlimit/ns3/named3.conf  CONF-C  2015
+./bin/tests/system/fetchlimit/ns3/named1.conf.in       CONF-C  2015,2018
+./bin/tests/system/fetchlimit/ns3/named2.conf.in       CONF-C  2015,2018
+./bin/tests/system/fetchlimit/ns3/named3.conf.in       CONF-C  2015,2018
 ./bin/tests/system/fetchlimit/ns3/root.hint    ZONE    2015
 ./bin/tests/system/fetchlimit/prereq.sh                SH      2015,2016
-./bin/tests/system/fetchlimit/setup.sh         SH      2015
-./bin/tests/system/fetchlimit/tests.sh         SH      2015,2016
-./bin/tests/system/filter-aaaa/clean.sh                SH      2010,2012,2014
+./bin/tests/system/fetchlimit/setup.sh         SH      2015,2018
+./bin/tests/system/fetchlimit/tests.sh         SH      2015,2016,2018
+./bin/tests/system/filter-aaaa/clean.sh                SH      2010,2012,2014,2018
 ./bin/tests/system/filter-aaaa/conf/bad1.conf  CONF-C  2010
 ./bin/tests/system/filter-aaaa/conf/bad2.conf  CONF-C  2010
 ./bin/tests/system/filter-aaaa/conf/bad3.conf  CONF-C  2010
@@ -1339,64 +1328,66 @@
 ./bin/tests/system/filter-aaaa/conf/good6.conf CONF-C  2010
 ./bin/tests/system/filter-aaaa/conf/good7.conf CONF-C  2010
 ./bin/tests/system/filter-aaaa/conf/good8.conf CONF-C  2010
-./bin/tests/system/filter-aaaa/ns1/named.conf  CONF-C  2010
+./bin/tests/system/filter-aaaa/ns1/named.conf.in       CONF-C  2010,2018
 ./bin/tests/system/filter-aaaa/ns1/root.db     ZONE    2010,2012,2017
-./bin/tests/system/filter-aaaa/ns1/sign.sh     SH      2010,2012,2014
+./bin/tests/system/filter-aaaa/ns1/sign.sh     SH      2010,2012,2014,2018
 ./bin/tests/system/filter-aaaa/ns1/signed.db.in        ZONE    2010,2012,2017
 ./bin/tests/system/filter-aaaa/ns1/signed.db.presigned X       2014,2017
 ./bin/tests/system/filter-aaaa/ns1/unsigned.db ZONE    2010,2012,2017
 ./bin/tests/system/filter-aaaa/ns2/hints       ZONE    2010
-./bin/tests/system/filter-aaaa/ns2/named.conf  CONF-C  2010
+./bin/tests/system/filter-aaaa/ns2/named.conf.in       CONF-C  2010,2018
 ./bin/tests/system/filter-aaaa/ns3/hints       ZONE    2010
-./bin/tests/system/filter-aaaa/ns3/named.conf  CONF-C  2010
-./bin/tests/system/filter-aaaa/ns4/named.conf  CONF-C  2010
+./bin/tests/system/filter-aaaa/ns3/named.conf.in       CONF-C  2010,2018
+./bin/tests/system/filter-aaaa/ns4/named.conf.in       CONF-C  2010,2018
 ./bin/tests/system/filter-aaaa/ns4/root.db     ZONE    2010,2012,2017
-./bin/tests/system/filter-aaaa/ns4/sign.sh     SH      2010,2012,2014
+./bin/tests/system/filter-aaaa/ns4/sign.sh     SH      2010,2012,2014,2018
 ./bin/tests/system/filter-aaaa/ns4/signed.db.in        ZONE    2010,2012,2017
 ./bin/tests/system/filter-aaaa/ns4/signed.db.presigned X       2014
 ./bin/tests/system/filter-aaaa/ns4/unsigned.db ZONE    2010,2012,2014,2017
 ./bin/tests/system/filter-aaaa/prereq.sh       SH      2010,2012,2014,2016
-./bin/tests/system/filter-aaaa/setup.sh                SH      2010,2012,2014
-./bin/tests/system/filter-aaaa/tests.sh                SH      2010,2012,2015,2016,2017
+./bin/tests/system/filter-aaaa/setup.sh                SH      2010,2012,2014,2018
+./bin/tests/system/filter-aaaa/tests.sh                SH      2010,2012,2015,2016,2017,2018
 ./bin/tests/system/formerr/badoptoption                X       2015
-./bin/tests/system/formerr/clean.sh            SH      2013,2015
+./bin/tests/system/formerr/clean.sh            SH      2013,2015,2018
 ./bin/tests/system/formerr/formerr.pl          PERL    2013,2014
 ./bin/tests/system/formerr/nametoolong         X       2013
 ./bin/tests/system/formerr/noquestions         X       2013
-./bin/tests/system/formerr/ns1/named.conf      CONF-C  2013
+./bin/tests/system/formerr/ns1/named.conf.in   CONF-C  2013,2018
 ./bin/tests/system/formerr/ns1/root.db         ZONE    2013
-./bin/tests/system/formerr/tests.sh            SH      2013,2015,2016
+./bin/tests/system/formerr/setup.sh            SH      2018
+./bin/tests/system/formerr/tests.sh            SH      2013,2015,2016,2018
 ./bin/tests/system/formerr/twoquestions                X       2013
-./bin/tests/system/forward/clean.sh            SH      2000,2001,2004,2007,2012,2015
+./bin/tests/system/forward/clean.sh            SH      2000,2001,2004,2007,2012,2015,2018
 ./bin/tests/system/forward/ns1/example.db      X       2000,2001
-./bin/tests/system/forward/ns1/named.conf      CONF-C  2000,2001,2004,2007
+./bin/tests/system/forward/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/forward/ns1/root.db         ZONE    2000,2001,2004,2007
 ./bin/tests/system/forward/ns2/example.db      X       2000,2001
-./bin/tests/system/forward/ns2/named.conf      CONF-C  2000,2001,2004,2007,2013,2014
+./bin/tests/system/forward/ns2/named.conf.in   CONF-C  2000,2001,2004,2007,2013,2014,2018
 ./bin/tests/system/forward/ns2/root.db         ZONE    2000,2001,2004,2007
-./bin/tests/system/forward/ns3/named.conf      CONF-C  2000,2001,2004,2007
+./bin/tests/system/forward/ns3/named.conf.in   CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/forward/ns3/root.db         ZONE    2000,2001,2004,2007
-./bin/tests/system/forward/ns4/named.conf      CONF-C  2000,2001,2004,2007,2013,2014
+./bin/tests/system/forward/ns4/named.conf.in   CONF-C  2000,2001,2004,2007,2013,2014,2018
 ./bin/tests/system/forward/ns4/root.db         ZONE    2000,2001,2004,2007
-./bin/tests/system/forward/ns5/named.conf      CONF-C  2011
+./bin/tests/system/forward/ns5/named.conf.in   CONF-C  2011,2018
 ./bin/tests/system/forward/ns5/root.db         ZONE    2011
 ./bin/tests/system/forward/rfc1918-inherited.conf      CONF-C  2016
 ./bin/tests/system/forward/rfc1918-notinherited.conf   CONF-C  2016
-./bin/tests/system/forward/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016
+./bin/tests/system/forward/setup.sh            SH      2018
+./bin/tests/system/forward/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/forward/ula-inherited.conf  CONF-C  2016
 ./bin/tests/system/forward/ula-notinherited.conf       CONF-C  2016
 ./bin/tests/system/genzone.sh                  SH      2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/glue/clean.sh               SH      2000,2001,2004,2007,2012,2015
+./bin/tests/system/glue/clean.sh               SH      2000,2001,2004,2007,2012,2015,2018
 ./bin/tests/system/glue/fi.good                        X       2000,2001
 ./bin/tests/system/glue/noglue.good            X       2000,2001
 ./bin/tests/system/glue/ns1/cache.in           ZONE    2000,2001,2004,2007
 ./bin/tests/system/glue/ns1/mil.db             ZONE    2000,2001,2004,2007
-./bin/tests/system/glue/ns1/named.conf         CONF-C  2000,2001,2004,2005,2007,2009
+./bin/tests/system/glue/ns1/named.conf.in      CONF-C  2000,2001,2004,2005,2007,2009,2018
 ./bin/tests/system/glue/ns1/net.db             ZONE    2000,2001,2004,2007
 ./bin/tests/system/glue/ns1/root-servers.nil.db        ZONE    2000,2001,2004,2007
 ./bin/tests/system/glue/ns1/root.db            ZONE    2000,2001,2004,2007
-./bin/tests/system/glue/setup.sh               SH      2001,2004,2007,2012
-./bin/tests/system/glue/tests.sh               SH      2000,2001,2003,2004,2007,2012,2013,2016
+./bin/tests/system/glue/setup.sh               SH      2001,2004,2007,2012,2018
+./bin/tests/system/glue/tests.sh               SH      2000,2001,2003,2004,2007,2012,2013,2016,2018
 ./bin/tests/system/glue/xx.good                        X       2000,2001
 ./bin/tests/system/glue/yy.good                        X       2000,2001,2003
 ./bin/tests/system/gost/clean.sh               SH      2010,2012,2014
@@ -1410,102 +1401,105 @@
 ./bin/tests/system/ifconfig.sh                 SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013
 ./bin/tests/system/inline/.gitignore           X       2014
 ./bin/tests/system/inline/checkdsa.sh.in       SH      2013,2014
-./bin/tests/system/inline/clean.sh             SH      2011,2012,2013,2014,2015,2017
-./bin/tests/system/inline/ns1/named.conf       CONF-C  2011
+./bin/tests/system/inline/clean.sh             SH      2011,2012,2013,2014,2015,2017,2018
+./bin/tests/system/inline/ns1/named.conf.in    CONF-C  2011,2018
 ./bin/tests/system/inline/ns1/root.db.in       ZONE    2011,2012,2013,2017
 ./bin/tests/system/inline/ns1/sign.sh          SH      2011,2012,2013,2014
 ./bin/tests/system/inline/ns2/bits.db.in       ZONE    2011
-./bin/tests/system/inline/ns2/named.conf       CONF-C  2011,2012,2013,2014,2017
+./bin/tests/system/inline/ns2/named.conf.in    CONF-C  2011,2012,2013,2014,2017,2018
 ./bin/tests/system/inline/ns2/nsec3-loop.db    ZONE    2017
 ./bin/tests/system/inline/ns3/master.db.in     ZONE    2011,2012
 ./bin/tests/system/inline/ns3/master2.db.in    ZONE    2011,2012
 ./bin/tests/system/inline/ns3/master3.db.in    ZONE    2012,2013
 ./bin/tests/system/inline/ns3/master4.db.in    ZONE    2012
-./bin/tests/system/inline/ns3/named.conf       CONF-C  2011,2012,2013,2015,2017
+./bin/tests/system/inline/ns3/named.conf.in    CONF-C  2011,2012,2013,2015,2017,2018
 ./bin/tests/system/inline/ns3/sign.sh          SH      2011,2012,2013,2014,2017
-./bin/tests/system/inline/ns4/named.conf       CONF-C  2011
+./bin/tests/system/inline/ns4/named.conf.in    CONF-C  2011,2018
 ./bin/tests/system/inline/ns4/noixfr.db.in     ZONE    2011
-./bin/tests/system/inline/ns5/named.conf.post  CONF-C  2011
-./bin/tests/system/inline/ns5/named.conf.pre   CONF-C  2011
-./bin/tests/system/inline/ns6/named.conf       CONF-C  2011
-./bin/tests/system/inline/ns7/named.conf       CONF-C  2017
+./bin/tests/system/inline/ns5/named.conf.post  CONF-C  2011,2018
+./bin/tests/system/inline/ns5/named.conf.pre   CONF-C  2011,2018
+./bin/tests/system/inline/ns6/named.conf.in    CONF-C  2011,2018
+./bin/tests/system/inline/ns7/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/inline/ns7/sign.sh          SH      2017
 ./bin/tests/system/inline/prereq.sh            SH      2014
-./bin/tests/system/inline/setup.sh             SH      2011,2012,2013,2014,2017
-./bin/tests/system/inline/tests.sh             SH      2011,2012,2013,2014,2016,2017
-./bin/tests/system/integrity/clean.sh          SH      2017
+./bin/tests/system/inline/setup.sh             SH      2011,2012,2013,2014,2017,2018
+./bin/tests/system/inline/tests.sh             SH      2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/integrity/clean.sh          SH      2017,2018
 ./bin/tests/system/integrity/ns1/mx-cname.db   ZONE    2017
-./bin/tests/system/integrity/ns1/named.conf    CONF-C  2017
+./bin/tests/system/integrity/ns1/named.conf.in CONF-C  2017,2018
 ./bin/tests/system/integrity/ns1/srv-cname.db  ZONE    2017
-./bin/tests/system/integrity/tests.sh          SH      2017
+./bin/tests/system/integrity/setup.sh          SH      2018
+./bin/tests/system/integrity/tests.sh          SH      2017,2018
 ./bin/tests/system/ixfr/ans2/startme           X       2011
-./bin/tests/system/ixfr/clean.sh               SH      2001,2004,2007,2011,2012,2014,2015
+./bin/tests/system/ixfr/clean.sh               SH      2001,2004,2007,2011,2012,2014,2015,2018
 ./bin/tests/system/ixfr/ns1/.gitignore         X       2012
 ./bin/tests/system/ixfr/ns1/startme            X       2012,2013
 ./bin/tests/system/ixfr/ns3/mytest0.db         ZONE    2011
 ./bin/tests/system/ixfr/ns3/mytest1.db         ZONE    2011
 ./bin/tests/system/ixfr/ns3/mytest2.db         ZONE    2011
-./bin/tests/system/ixfr/ns3/named.conf         CONF-C  2011,2014
+./bin/tests/system/ixfr/ns3/named.conf.in      CONF-C  2011,2014,2018
 ./bin/tests/system/ixfr/ns3/subtest0.db                ZONE    2011
 ./bin/tests/system/ixfr/ns3/subtest1.db                ZONE    2011
-./bin/tests/system/ixfr/ns4/named.conf         CONF-C  2011
-./bin/tests/system/ixfr/prereq.sh              SH      2001,2004,2007,2012,2014
-./bin/tests/system/ixfr/setup.sh               SH      2001,2004,2007,2011,2012,2014
-./bin/tests/system/ixfr/tests.sh               SH      2001,2004,2007,2011,2012,2014,2016
+./bin/tests/system/ixfr/ns4/named.conf.in      CONF-C  2011,2018
+./bin/tests/system/ixfr/prereq.sh              SH      2001,2004,2007,2012,2014,2018
+./bin/tests/system/ixfr/setup.sh               SH      2001,2004,2007,2011,2012,2014,2018
+./bin/tests/system/ixfr/tests.sh               SH      2001,2004,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/legacy/build.sh             SH      2014
-./bin/tests/system/legacy/clean.sh             SH      2014
-./bin/tests/system/legacy/ns1/named1.conf      CONF-C  2014
-./bin/tests/system/legacy/ns1/named2.conf      CONF-C  2014
+./bin/tests/system/legacy/clean.sh             SH      2014,2018
+./bin/tests/system/legacy/ns1/named1.conf.in   CONF-C  2014,2018
+./bin/tests/system/legacy/ns1/named2.conf.in   CONF-C  2014,2018
 ./bin/tests/system/legacy/ns1/root.db          ZONE    2014
 ./bin/tests/system/legacy/ns1/trusted.conf     X       2014
 ./bin/tests/system/legacy/ns2/dropedns.db      ZONE    2014
-./bin/tests/system/legacy/ns2/named.conf       CONF-C  2014
+./bin/tests/system/legacy/ns2/named.conf.in    CONF-C  2014,2018
 ./bin/tests/system/legacy/ns2/named.dropedns   X       2014
 ./bin/tests/system/legacy/ns3/dropedns-notcp.db        ZONE    2014
-./bin/tests/system/legacy/ns3/named.conf       CONF-C  2014
+./bin/tests/system/legacy/ns3/named.conf.in    CONF-C  2014,2018
 ./bin/tests/system/legacy/ns3/named.dropedns   X       2014
 ./bin/tests/system/legacy/ns3/named.notcp      X       2014
 ./bin/tests/system/legacy/ns4/named.args       X       2014
-./bin/tests/system/legacy/ns4/named.conf       CONF-C  2014
+./bin/tests/system/legacy/ns4/named.conf.in    CONF-C  2014,2018
 ./bin/tests/system/legacy/ns4/plain.db         ZONE    2014
 ./bin/tests/system/legacy/ns5/named.args       X       2014
-./bin/tests/system/legacy/ns5/named.conf       CONF-C  2014
+./bin/tests/system/legacy/ns5/named.conf.in    CONF-C  2014,2018
 ./bin/tests/system/legacy/ns5/named.notcp      X       2014
 ./bin/tests/system/legacy/ns5/plain-notcp.db   ZONE    2014
 ./bin/tests/system/legacy/ns6/edns512.db.in    ZONE    2014
 ./bin/tests/system/legacy/ns6/edns512.db.signed        X       2014
 ./bin/tests/system/legacy/ns6/named.args       X       2014
-./bin/tests/system/legacy/ns6/named.conf       CONF-C  2014
-./bin/tests/system/legacy/ns6/sign.sh          SH      2014
+./bin/tests/system/legacy/ns6/named.conf.in    CONF-C  2014,2018
+./bin/tests/system/legacy/ns6/sign.sh          SH      2014,2018
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.in      ZONE    2014
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.signed  X       2014
 ./bin/tests/system/legacy/ns7/named.args       X       2014
-./bin/tests/system/legacy/ns7/named.conf       CONF-C  2014
+./bin/tests/system/legacy/ns7/named.conf.in    CONF-C  2014,2018
 ./bin/tests/system/legacy/ns7/named.notcp      X       2014
-./bin/tests/system/legacy/ns7/sign.sh          SH      2014
-./bin/tests/system/legacy/setup.sh             SH      2014
-./bin/tests/system/legacy/tests.sh             SH      2014,2015,2016
-./bin/tests/system/limits/clean.sh             SH      2000,2001,2004,2007,2012,2015
+./bin/tests/system/legacy/ns7/sign.sh          SH      2014,2018
+./bin/tests/system/legacy/setup.sh             SH      2014,2018
+./bin/tests/system/legacy/tests.sh             SH      2014,2015,2016,2018
+./bin/tests/system/limits/clean.sh             SH      2000,2001,2004,2007,2012,2015,2018
 ./bin/tests/system/limits/knowngood.dig.out.1000       X       2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.2000       X       2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.3000       X       2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.4000       X       2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset    X       2000,2001
 ./bin/tests/system/limits/ns1/example.db       ZONE    2000,2001,2004,2007
-./bin/tests/system/limits/ns1/named.conf       CONF-C  2000,2001,2004,2007
+./bin/tests/system/limits/ns1/named.conf.in    CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/limits/ns1/root.db          ZONE    2000,2001,2004,2007
-./bin/tests/system/limits/tests.sh             SH      2000,2001,2004,2007,2011,2012,2016
-./bin/tests/system/logfileconfig/clean.sh      SH      2011,2012,2016
-./bin/tests/system/logfileconfig/ns1/named.dirconf     CONF-C  2011
-./bin/tests/system/logfileconfig/ns1/named.pipeconf    CONF-C  2011
-./bin/tests/system/logfileconfig/ns1/named.plain       CONF-C  2011
-./bin/tests/system/logfileconfig/ns1/named.symconf     CONF-C  2011
-./bin/tests/system/logfileconfig/ns1/named.unlimited   CONF-C  2016
-./bin/tests/system/logfileconfig/ns1/named.versconf    CONF-C  2016
-./bin/tests/system/logfileconfig/ns1/rndc.conf CONF-C  2011,2017
+./bin/tests/system/limits/setup.sh             SH      2018
+./bin/tests/system/limits/tests.sh             SH      2000,2001,2004,2007,2011,2012,2016,2018
+./bin/tests/system/logfileconfig/clean.sh      SH      2011,2012,2016,2018
+./bin/tests/system/logfileconfig/ns1/controls.conf.in  CONF-C  2018
+./bin/tests/system/logfileconfig/ns1/named.dirconf     CONF-C  2011,2018
+./bin/tests/system/logfileconfig/ns1/named.pipeconf    CONF-C  2011,2018
+./bin/tests/system/logfileconfig/ns1/named.plain       CONF-C  2011,2018
+./bin/tests/system/logfileconfig/ns1/named.symconf     CONF-C  2011,2018
+./bin/tests/system/logfileconfig/ns1/named.unlimited   CONF-C  2016,2018
+./bin/tests/system/logfileconfig/ns1/named.versconf    CONF-C  2016,2018
+./bin/tests/system/logfileconfig/ns1/rndc.conf.in      CONF-C  2011,2017,2018
 ./bin/tests/system/logfileconfig/ns1/root.db   ZONE    2011
-./bin/tests/system/logfileconfig/setup.sh      SH      2011,2012,2014
-./bin/tests/system/logfileconfig/tests.sh      SH      2011,2012,2013,2016,2017
+./bin/tests/system/logfileconfig/setup.sh      SH      2011,2012,2014,2018
+./bin/tests/system/logfileconfig/tests.sh      SH      2011,2012,2013,2016,2017,2018
 ./bin/tests/system/lwresd/Makefile.in          MAKE    2000,2001,2002,2004,2007,2009,2012,2015
 ./bin/tests/system/lwresd/clean.sh             SH      2008,2012,2013,2015,2016
 ./bin/tests/system/lwresd/lwresd1/lwresd.conf  CONF-C  2000,2001,2004,2007
@@ -1522,123 +1516,123 @@
 ./bin/tests/system/lwresd/ns1/root.db          ZONE    2000,2001,2004,2007
 ./bin/tests/system/lwresd/resolv.conf          CONF-SH 2000,2001,2004,2007,2012
 ./bin/tests/system/lwresd/tests.sh             SH      2000,2001,2004,2007,2011,2012,2013,2016
-./bin/tests/system/masterfile/clean.sh         SH      2001,2004,2007,2010,2012,2015
+./bin/tests/system/masterfile/clean.sh         SH      2001,2004,2007,2010,2012,2015,2018
 ./bin/tests/system/masterfile/knowngood.dig.out        X       2001,2004,2012
 ./bin/tests/system/masterfile/ns1/include.db   ZONE    2001,2004,2007,2012
-./bin/tests/system/masterfile/ns1/named.conf   CONF-C  2001,2004,2007
+./bin/tests/system/masterfile/ns1/named.conf.in        CONF-C  2001,2004,2007,2018
 ./bin/tests/system/masterfile/ns1/sub.db       ZONE    2001,2004,2007
 ./bin/tests/system/masterfile/ns1/ttl1.db      ZONE    2001,2004,2007
 ./bin/tests/system/masterfile/ns1/ttl2.db      ZONE    2001,2004,2007
 ./bin/tests/system/masterfile/ns2/example.db   ZONE    2010
-./bin/tests/system/masterfile/ns2/named.conf   CONF-C  2010
-./bin/tests/system/masterfile/tests.sh         SH      2001,2004,2007,2010,2012,2015,2016
+./bin/tests/system/masterfile/ns2/named.conf.in        CONF-C  2010,2018
+./bin/tests/system/masterfile/setup.sh         SH      2018
+./bin/tests/system/masterfile/tests.sh         SH      2001,2004,2007,2010,2012,2015,2016,2018
 ./bin/tests/system/masterfile/zone/inheritownerafterinclude.db ZONE    2015
 ./bin/tests/system/masterfile/zone/inheritownerafterinclude.good       X       2015
 ./bin/tests/system/masterfile/zone/nameservers.db      ZONE    2015
-./bin/tests/system/masterformat/clean.sh       SH      2005,2007,2011,2012,2014,2015
+./bin/tests/system/masterformat/clean.sh       SH      2005,2007,2011,2012,2014,2015,2018
 ./bin/tests/system/masterformat/ns1/compile.sh SH      2005,2006,2007,2011,2012
 ./bin/tests/system/masterformat/ns1/example.db ZONE    2005,2007,2014
 ./bin/tests/system/masterformat/ns1/large.db.in        ZONE    2012
-./bin/tests/system/masterformat/ns1/named.conf CONF-C  2005,2007,2011,2012
+./bin/tests/system/masterformat/ns1/named.conf.in      CONF-C  2005,2007,2011,2012,2018
 ./bin/tests/system/masterformat/ns2/formerly-text.db.in        ZONE    2011
-./bin/tests/system/masterformat/ns2/named.conf CONF-C  2005,2007,2011,2012
+./bin/tests/system/masterformat/ns2/named.conf.in      CONF-C  2005,2007,2011,2012,2018
 ./bin/tests/system/masterformat/prereq.sh      SH      2014
-./bin/tests/system/masterformat/setup.sh       SH      2005,2006,2007,2011,2012,2014
-./bin/tests/system/masterformat/tests.sh       SH      2005,2007,2011,2012,2014,2016
+./bin/tests/system/masterformat/setup.sh       SH      2005,2006,2007,2011,2012,2014,2018
+./bin/tests/system/masterformat/tests.sh       SH      2005,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/metadata/child.db           ZONE    2009
 ./bin/tests/system/metadata/clean.sh           SH      2009,2011,2012,2014,2017
 ./bin/tests/system/metadata/parent.db          ZONE    2009
 ./bin/tests/system/metadata/prereq.sh          SH      2009,2012,2014
-./bin/tests/system/metadata/setup.sh           SH      2009,2011,2012,2014
-./bin/tests/system/metadata/tests.sh           SH      2009,2011,2012,2013,2014,2016,2017
-./bin/tests/system/notify/clean.sh             SH      2000,2001,2004,2007,2011,2012,2014,2015
-./bin/tests/system/notify/ns1/named.conf       CONF-C  2000,2001,2004,2007
+./bin/tests/system/metadata/setup.sh           SH      2009,2011,2012,2014,2018
+./bin/tests/system/metadata/tests.sh           SH      2009,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/notify/clean.sh             SH      2000,2001,2004,2007,2011,2012,2014,2015,2018
+./bin/tests/system/notify/ns1/named.conf.in    CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/notify/ns1/root.db          ZONE    2000,2001,2004,2007
 ./bin/tests/system/notify/ns2/example1.db      ZONE    2000,2001,2002,2004,2007,2009
 ./bin/tests/system/notify/ns2/example2.db      ZONE    2000,2001,2002,2004,2007,2009
 ./bin/tests/system/notify/ns2/example3.db      ZONE    2000,2001,2002,2004,2007,2009
 ./bin/tests/system/notify/ns2/example4.db      ZONE    2000,2001,2002,2004,2007,2009
 ./bin/tests/system/notify/ns2/generic.db       ZONE    2014
-./bin/tests/system/notify/ns2/named.conf       CONF-C  2000,2001,2004,2007,2011,2014
-./bin/tests/system/notify/ns3/named.conf       CONF-C  2000,2001,2004,2007
-./bin/tests/system/notify/ns4/named.conf       CONF-C  2014
-./bin/tests/system/notify/ns4/named.port       X       2014
-./bin/tests/system/notify/ns5/named.conf       CONF-C  2015,2017
+./bin/tests/system/notify/ns2/named.conf.in    CONF-C  2000,2001,2004,2007,2011,2014,2018
+./bin/tests/system/notify/ns3/named.conf.in    CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/notify/ns4/named.conf.in    CONF-C  2014,2018
+./bin/tests/system/notify/ns4/named.port.in    X       2014,2018
+./bin/tests/system/notify/ns5/named.conf.in    CONF-C  2015,2017,2018
 ./bin/tests/system/notify/ns5/x21.db           ZONE    2015
-./bin/tests/system/notify/setup.sh             SH      2000,2001,2004,2007,2012,2014
-./bin/tests/system/notify/tests.sh             SH      2000,2001,2004,2007,2011,2012,2014,2015,2016
-./bin/tests/system/nslookup/clean.sh           SH      2014,2015
-./bin/tests/system/nslookup/ns1/named.conf     CONF-C  2014
-./bin/tests/system/nslookup/setup.sh           SH      2014
-./bin/tests/system/nslookup/tests.sh           SH      2014,2016
-./bin/tests/system/nsupdate/ans4/ans.pl                PERL    2017
-./bin/tests/system/nsupdate/clean.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2014,2015,2016,2017
+./bin/tests/system/notify/setup.sh             SH      2000,2001,2004,2007,2012,2014,2018
+./bin/tests/system/notify/tests.sh             SH      2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
+./bin/tests/system/nslookup/clean.sh           SH      2014,2015,2018
+./bin/tests/system/nslookup/ns1/named.conf.in  CONF-C  2014,2018
+./bin/tests/system/nslookup/setup.sh           SH      2014,2018
+./bin/tests/system/nslookup/tests.sh           SH      2014,2016,2018
+./bin/tests/system/nsupdate/ans4/ans.pl                PERL    2017,2018
+./bin/tests/system/nsupdate/clean.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/nsupdate/commandlist                X       2012
 ./bin/tests/system/nsupdate/knowngood.ns1.after        X       2000,2001,2003,2004,2009
 ./bin/tests/system/nsupdate/knowngood.ns1.afterstop    X       2001,2004
 ./bin/tests/system/nsupdate/knowngood.ns1.before       X       2000,2001,2003,2004,2009
 ./bin/tests/system/nsupdate/ns1/example1.db    ZONE    2000,2001,2002,2004,2007,2009
-./bin/tests/system/nsupdate/ns1/named.conf     CONF-C  2000,2001,2004,2005,2007,2009,2011,2012,2013,2016
+./bin/tests/system/nsupdate/ns1/named.conf.in  CONF-C  2000,2001,2004,2005,2007,2009,2011,2012,2013,2016,2018
 ./bin/tests/system/nsupdate/ns1/sample.db.in   ZONE    2016
-./bin/tests/system/nsupdate/ns2/named.conf     CONF-C  2000,2001,2004,2007,2011,2016,2017
+./bin/tests/system/nsupdate/ns2/named.conf.in  CONF-C  2000,2001,2004,2007,2011,2016,2017,2018
 ./bin/tests/system/nsupdate/ns2/sample.db.in   ZONE    2016
 ./bin/tests/system/nsupdate/ns3/delegation.test.db.in  ZONE    2016
 ./bin/tests/system/nsupdate/ns3/dnskey.test.db.in      ZONE    2011
 ./bin/tests/system/nsupdate/ns3/example.db.in  ZONE    2010
-./bin/tests/system/nsupdate/ns3/named.conf     CONF-C  2010,2011,2016
+./bin/tests/system/nsupdate/ns3/named.conf.in  CONF-C  2010,2011,2016,2018
 ./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in  ZONE    2010
 ./bin/tests/system/nsupdate/ns3/sign.sh                SH      2010,2011,2012,2014,2016
 ./bin/tests/system/nsupdate/ns3/too-big.test.db.in     ZONE    2016
 ./bin/tests/system/nsupdate/ns5/local.db.in    ZONE    2017
 ./bin/tests/system/nsupdate/ns5/named.args     X       2017
-./bin/tests/system/nsupdate/ns5/named.conf     CONF-C  2017
-./bin/tests/system/nsupdate/prereq.sh          SH      2014,2015
-./bin/tests/system/nsupdate/setup.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017
+./bin/tests/system/nsupdate/ns5/named.conf.in  CONF-C  2017,2018
+./bin/tests/system/nsupdate/prereq.sh          SH      2014,2015,2018
+./bin/tests/system/nsupdate/setup.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/nsupdate/update_test.pl     PERL    2000,2001,2004,2007,2012
-./bin/tests/system/nsupdate/verylarge          ZONE    2015
+./bin/tests/system/nsupdate/update_test.pl     PERL    2000,2001,2004,2007,2012,2018
+./bin/tests/system/nsupdate/verylarge.in       ZONE    2015,2018
 ./bin/tests/system/org.isc.bind.system         SH      2010,2012
 ./bin/tests/system/org.isc.bind.system.plist   X       2010
 ./bin/tests/system/packet.pl                   PERL    2011,2012
-./bin/tests/system/pending/clean.sh            SH      2009,2012,2014
-./bin/tests/system/pending/ns1/named.conf      CONF-C  2009
+./bin/tests/system/pending/clean.sh            SH      2009,2012,2014,2018
+./bin/tests/system/pending/ns1/named.conf.in   CONF-C  2009,2018
 ./bin/tests/system/pending/ns1/root.db.in      ZONE    2009,2010
 ./bin/tests/system/pending/ns1/sign.sh         SH      2009,2010,2012,2014
 ./bin/tests/system/pending/ns2/example.com.db.in       ZONE    2009,2010
 ./bin/tests/system/pending/ns2/example.db.in   ZONE    2009,2010
 ./bin/tests/system/pending/ns2/forgery.db      ZONE    2010
-./bin/tests/system/pending/ns2/named.conf      CONF-C  2009,2010,2016
+./bin/tests/system/pending/ns2/named.conf.in   CONF-C  2009,2010,2016,2018
 ./bin/tests/system/pending/ns2/sign.sh         SH      2009,2010,2012,2014
 ./bin/tests/system/pending/ns3/hostile.db      ZONE    2009
 ./bin/tests/system/pending/ns3/mail.example.db ZONE    2009
-./bin/tests/system/pending/ns3/named.conf      CONF-C  2009
-./bin/tests/system/pending/ns4/named.conf      CONF-C  2009
+./bin/tests/system/pending/ns3/named.conf.in   CONF-C  2009,2018
+./bin/tests/system/pending/ns4/named.conf.in   CONF-C  2009,2018
 ./bin/tests/system/pending/prereq.sh           SH      2009,2012,2014
-./bin/tests/system/pending/setup.sh            SH      2009,2012,2014
-./bin/tests/system/pending/tests.sh            SH      2009,2010,2012,2016
+./bin/tests/system/pending/setup.sh            SH      2009,2012,2014,2018
+./bin/tests/system/pending/tests.sh            SH      2009,2010,2012,2016,2018
 ./bin/tests/system/pkcs11/clean.sh             SH      2010,2012,2014
 ./bin/tests/system/pkcs11/ns1/example.db.in    ZONE    2010
 ./bin/tests/system/pkcs11/ns1/named.conf       CONF-C  2010
-./bin/tests/system/pkcs11/prereq.sh            SH      2010,2012,2014
 ./bin/tests/system/pkcs11/setup.sh             SH      2010,2012,2013,2014
 ./bin/tests/system/pkcs11/tests.sh             SH      2010,2012,2014,2016
 ./bin/tests/system/pkcs11/usepkcs11            X       2010
 ./bin/tests/system/reclimit/README             TXT.BRIEF       2014,2017
-./bin/tests/system/reclimit/ans2/ans.pl                PERL    2014,2015,2016,2017
-./bin/tests/system/reclimit/ans7/ans.pl                PERL    2014
-./bin/tests/system/reclimit/clean.sh           SH      2014
-./bin/tests/system/reclimit/ns1/named.conf     CONF-C  2014
+./bin/tests/system/reclimit/ans2/ans.pl                PERL    2014,2015,2016,2017,2018
+./bin/tests/system/reclimit/ans7/ans.pl                PERL    2014,2018
+./bin/tests/system/reclimit/clean.sh           SH      2014,2018
+./bin/tests/system/reclimit/ns1/named.conf.in  CONF-C  2014,2018
 ./bin/tests/system/reclimit/ns1/root.db                ZONE    2014,2017
 ./bin/tests/system/reclimit/ns3/.gitignore     X       2014
 ./bin/tests/system/reclimit/ns3/hints.db       ZONE    2014
-./bin/tests/system/reclimit/ns3/named1.conf    CONF-C  2014
-./bin/tests/system/reclimit/ns3/named2.conf    CONF-C  2014
-./bin/tests/system/reclimit/ns3/named3.conf    CONF-C  2014
-./bin/tests/system/reclimit/ns3/named4.conf    CONF-C  2014
-./bin/tests/system/reclimit/prereq.sh          SH      2015,2017
-./bin/tests/system/reclimit/setup.sh           SH      2014
-./bin/tests/system/reclimit/tests.sh           SH      2014,2015,2016,2017
-./bin/tests/system/redirect/clean.sh           SH      2011,2012,2013,2014,2015
+./bin/tests/system/reclimit/ns3/named1.conf.in CONF-C  2014,2018
+./bin/tests/system/reclimit/ns3/named2.conf.in CONF-C  2014,2018
+./bin/tests/system/reclimit/ns3/named3.conf.in CONF-C  2014,2018
+./bin/tests/system/reclimit/ns3/named4.conf.in CONF-C  2014,2018
+./bin/tests/system/reclimit/prereq.sh          SH      2015,2017,2018
+./bin/tests/system/reclimit/setup.sh           SH      2014,2018
+./bin/tests/system/reclimit/tests.sh           SH      2014,2015,2016,2017,2018
+./bin/tests/system/redirect/clean.sh           SH      2011,2012,2013,2014,2015,2018
 ./bin/tests/system/redirect/conf/bad1.conf     CONF-C  2011,2016
 ./bin/tests/system/redirect/conf/bad2.conf     CONF-C  2011,2016
 ./bin/tests/system/redirect/conf/bad3.conf     CONF-C  2011,2016
@@ -1647,33 +1641,33 @@
 ./bin/tests/system/redirect/conf/good3.conf    CONF-C  2011
 ./bin/tests/system/redirect/conf/good4.conf    CONF-C  2011
 ./bin/tests/system/redirect/ns1/example.db     ZONE    2011
-./bin/tests/system/redirect/ns1/named.conf     CONF-C  2011
+./bin/tests/system/redirect/ns1/named.conf.in  CONF-C  2011,2018
 ./bin/tests/system/redirect/ns1/redirect.db    ZONE    2011
 ./bin/tests/system/redirect/ns1/root.db                ZONE    2011
 ./bin/tests/system/redirect/ns1/sign.sh                SH      2011,2012,2014
 ./bin/tests/system/redirect/ns2/example.db.in  ZONE    2013
-./bin/tests/system/redirect/ns2/named.conf     CONF-C  2011,2013
+./bin/tests/system/redirect/ns2/named.conf.in  CONF-C  2011,2013,2018
 ./bin/tests/system/redirect/ns2/redirect.db.in ZONE    2011,2013
 ./bin/tests/system/redirect/prereq.sh          SH      2014
-./bin/tests/system/redirect/setup.sh           SH      2011,2012,2013,2014
-./bin/tests/system/redirect/tests.sh           SH      2011,2012,2013,2014,2016
-./bin/tests/system/resolver/ans2/ans.pl                PERL    2000,2001,2004,2007,2009,2010,2012
-./bin/tests/system/resolver/ans3/ans.pl                PERL    2000,2001,2004,2007,2009,2012
-./bin/tests/system/resolver/ans8/ans.pl                PERL    2017
-./bin/tests/system/resolver/clean.sh           SH      2008,2009,2010,2011,2012,2013,2014,2015,2016
-./bin/tests/system/resolver/ns1/named.conf     CONF-C  2000,2001,2004,2007,2009,2013,2014,2015
+./bin/tests/system/redirect/setup.sh           SH      2011,2012,2013,2014,2018
+./bin/tests/system/redirect/tests.sh           SH      2011,2012,2013,2014,2016,2018
+./bin/tests/system/resolver/ans2/ans.pl                PERL    2000,2001,2004,2007,2009,2010,2012,2018
+./bin/tests/system/resolver/ans3/ans.pl                PERL    2000,2001,2004,2007,2009,2012,2018
+./bin/tests/system/resolver/ans8/ans.pl                PERL    2017,2018
+./bin/tests/system/resolver/clean.sh           SH      2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/resolver/ns1/named.conf.in  CONF-C  2000,2001,2004,2007,2009,2013,2014,2015,2018
 ./bin/tests/system/resolver/ns1/root.hint      ZONE    2000,2001,2004,2007
 ./bin/tests/system/resolver/ns4/broken.db      ZONE    2012
 ./bin/tests/system/resolver/ns4/child.server.db        ZONE    2011
 ./bin/tests/system/resolver/ns4/moves.db       ZONE    2011
-./bin/tests/system/resolver/ns4/named.conf     CONF-C  2010,2011,2012,2015
+./bin/tests/system/resolver/ns4/named.conf.in  CONF-C  2010,2011,2012,2015,2018
 ./bin/tests/system/resolver/ns4/named.noaa     TXT.BRIEF       2010
 ./bin/tests/system/resolver/ns4/root.db                ZONE    2010,2014,2015,2017
 ./bin/tests/system/resolver/ns4/tld1.db                ZONE    2012,2014
 ./bin/tests/system/resolver/ns4/tld2.db                ZONE    2012,2014
 ./bin/tests/system/resolver/ns5/child.server.db        ZONE    2011
 ./bin/tests/system/resolver/ns5/moves.db       ZONE    2011
-./bin/tests/system/resolver/ns5/named.conf     CONF-C  2010,2011,2015
+./bin/tests/system/resolver/ns5/named.conf.in  CONF-C  2010,2011,2015,2018
 ./bin/tests/system/resolver/ns5/root.hint      ZONE    2010
 ./bin/tests/system/resolver/ns6/broken.db      ZONE    2012
 ./bin/tests/system/resolver/ns6/delegation-only.db     ZONE    2015
@@ -1681,75 +1675,75 @@
 ./bin/tests/system/resolver/ns6/example.net.db.in      ZONE    2010,2016
 ./bin/tests/system/resolver/ns6/keygen.sh      SH      2010,2012,2014,2017
 ./bin/tests/system/resolver/ns6/moves.db       ZONE    2011
-./bin/tests/system/resolver/ns6/named.conf     CONF-C  2010,2012,2015,2017
+./bin/tests/system/resolver/ns6/named.conf.in  CONF-C  2010,2012,2015,2017,2018
 ./bin/tests/system/resolver/ns6/root.db                ZONE    2010,2011
 ./bin/tests/system/resolver/ns6/to-be-removed.tld.db.in        ZONE    2012
 ./bin/tests/system/resolver/ns7/.gitignore     X       2014
 ./bin/tests/system/resolver/ns7/all-cnames.db  ZONE    2014
 ./bin/tests/system/resolver/ns7/named.args     X       2011,2012
-./bin/tests/system/resolver/ns7/named1.conf    CONF-C  2010,2011,2013,2014,2016
-./bin/tests/system/resolver/ns7/named2.conf    CONF-C  2013,2014,2016
+./bin/tests/system/resolver/ns7/named1.conf.in CONF-C  2010,2011,2013,2014,2016,2018
+./bin/tests/system/resolver/ns7/named2.conf.in CONF-C  2013,2014,2016,2018
 ./bin/tests/system/resolver/ns7/root.hint      ZONE    2010
 ./bin/tests/system/resolver/ns7/server.db.in   ZONE    2011
-./bin/tests/system/resolver/prereq.sh          SH      2000,2001,2004,2007,2012,2014
-./bin/tests/system/resolver/setup.sh           SH      2010,2011,2012,2013,2014
-./bin/tests/system/resolver/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/resolver/prereq.sh          SH      2000,2001,2004,2007,2012,2014,2018
+./bin/tests/system/resolver/setup.sh           SH      2010,2011,2012,2013,2014,2018
+./bin/tests/system/resolver/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/.gitignore             X       2015
-./bin/tests/system/rndc/clean.sh               SH      2011,2012,2015,2017
-./bin/tests/system/rndc/ns2/named.conf         CONF-C  2011,2012
+./bin/tests/system/rndc/clean.sh               SH      2011,2012,2015,2017,2018
+./bin/tests/system/rndc/ns2/named.conf.in      CONF-C  2011,2012,2018
 ./bin/tests/system/rndc/ns2/secondkey.conf     CONF-C  2012
-./bin/tests/system/rndc/ns3/named.conf         CONF-C  2012,2013
-./bin/tests/system/rndc/ns4/named.conf         CONF-C  2015
-./bin/tests/system/rndc/setup.sh               SH      2011,2012,2014
+./bin/tests/system/rndc/ns3/named.conf.in      CONF-C  2012,2013,2018
+./bin/tests/system/rndc/ns4/named.conf.in      CONF-C  2018
+./bin/tests/system/rndc/setup.sh               SH      2018
 ./bin/tests/system/rndc/tests.sh               SH      2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014
-./bin/tests/system/rpz/ns1/named.conf          CONF-C  2011,2013
-./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012,2013
-./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012,2013
-./bin/tests/system/rpz/ns2/bl.tld2.db.in       ZONE    2013
-./bin/tests/system/rpz/ns2/blv2.tld2.db.in     ZONE    2013
-./bin/tests/system/rpz/ns2/blv3.tld2.db.in     ZONE    2013
-./bin/tests/system/rpz/ns2/hints               ZONE    2011,2013
-./bin/tests/system/rpz/ns2/named.conf          CONF-C  2011,2012,2013
-./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012,2013
-./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013,2016
+./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2018
+./bin/tests/system/rpz/ns1/named.conf.in       CONF-C  2011,2013,2018
+./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012,2013,2018
+./bin/tests/system/rpz/ns2/bl.tld2.db.in       ZONE    2013,2018
+./bin/tests/system/rpz/ns2/blv2.tld2.db.in     ZONE    2013,2018
+./bin/tests/system/rpz/ns2/blv3.tld2.db.in     ZONE    2013,2018
+./bin/tests/system/rpz/ns2/hints               ZONE    2011,2013,2018
+./bin/tests/system/rpz/ns2/named.conf.in       CONF-C  2011,2012,2013,2018
+./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/ns3/crash1              X       2011,2013
 ./bin/tests/system/rpz/ns3/crash2              X       2011,2012,2013
-./bin/tests/system/rpz/ns3/hints               ZONE    2011,2013
-./bin/tests/system/rpz/ns3/named.conf          CONF-C  2011,2012,2013
-./bin/tests/system/rpz/ns4/hints               ZONE    2011,2013
-./bin/tests/system/rpz/ns4/named.conf          CONF-C  2011,2012,2013
-./bin/tests/system/rpz/ns4/tld4.db             ZONE    2011,2012,2013
-./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns3/hints               ZONE    2011,2013,2018
+./bin/tests/system/rpz/ns3/named.conf.in       CONF-C  2011,2012,2013,2018
+./bin/tests/system/rpz/ns4/hints               ZONE    2011,2013,2018
+./bin/tests/system/rpz/ns4/named.conf.in       CONF-C  2011,2012,2013,2018
+./bin/tests/system/rpz/ns4/tld4.db             ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012,2013,2018
 ./bin/tests/system/rpz/ns5/named.args          X       2013
-./bin/tests/system/rpz/ns5/named.conf          CONF-C  2012,2013
-./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013
-./bin/tests/system/rpz/ns6/hints               ZONE    2014
-./bin/tests/system/rpz/ns6/named.conf          CONF-C  2014
-./bin/tests/system/rpz/prereq.sh               SH      2014
-./bin/tests/system/rpz/qperf.sh                        SH      2012,2013
-./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013,2014
-./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013
-./bin/tests/system/rpz/test2                   ZONE    2011,2012,2013
-./bin/tests/system/rpz/test3                   ZONE    2011,2013
-./bin/tests/system/rpz/test4                   ZONE    2011,2013
-./bin/tests/system/rpz/test4a                  ZONE    2013
-./bin/tests/system/rpz/test5                   ZONE    2011,2012,2013
-./bin/tests/system/rpz/tests.sh                        SH      2011,2012,2013,2014,2016,2017
+./bin/tests/system/rpz/ns5/named.conf.in       CONF-C  2012,2013,2018
+./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013,2018
+./bin/tests/system/rpz/ns6/hints               ZONE    2014,2018
+./bin/tests/system/rpz/ns6/named.conf.in       CONF-C  2014,2018
+./bin/tests/system/rpz/prereq.sh               SH      2014,2018
+./bin/tests/system/rpz/qperf.sh                        SH      2012,2013,2018
+./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013,2014,2018
+./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/test2                   ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/test3                   ZONE    2011,2013,2018
+./bin/tests/system/rpz/test4                   ZONE    2011,2013,2018
+./bin/tests/system/rpz/test4a                  ZONE    2013,2018
+./bin/tests/system/rpz/test5                   ZONE    2011,2012,2013,2018
+./bin/tests/system/rpz/tests.sh                        SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rrl/.gitignore              X       2013
-./bin/tests/system/rrl/clean.sh                        SH      2013,2016
-./bin/tests/system/rrl/ns1/named.conf          CONF-C  2013
+./bin/tests/system/rrl/clean.sh                        SH      2013,2016,2018
+./bin/tests/system/rrl/ns1/named.conf.in       CONF-C  2013,2018
 ./bin/tests/system/rrl/ns1/root.db             ZONE    2013
 ./bin/tests/system/rrl/ns2/hints               ZONE    2013
-./bin/tests/system/rrl/ns2/named.conf          CONF-C  2013
+./bin/tests/system/rrl/ns2/named.conf.in       CONF-C  2013,2018
 ./bin/tests/system/rrl/ns2/tld2.db             ZONE    2013
 ./bin/tests/system/rrl/ns3/hints               ZONE    2013
-./bin/tests/system/rrl/ns3/named.conf          CONF-C  2013
+./bin/tests/system/rrl/ns3/named.conf.in       CONF-C  2013,2018
 ./bin/tests/system/rrl/ns3/tld3.db             ZONE    2013
-./bin/tests/system/rrl/prereq.sh               SH      2013,2016
-./bin/tests/system/rrl/setup.sh                        SH      2013
-./bin/tests/system/rrl/tests.sh                        SH      2013,2015,2016
-./bin/tests/system/rrsetorder/clean.sh         SH      2006,2007,2008,2011,2012,2015
+./bin/tests/system/rrl/prereq.sh               SH      2013,2016,2018
+./bin/tests/system/rrl/setup.sh                        SH      2013,2018
+./bin/tests/system/rrl/tests.sh                        SH      2013,2015,2016,2018
+./bin/tests/system/rrsetorder/clean.sh         SH      2006,2007,2008,2011,2012,2015,2018
 ./bin/tests/system/rrsetorder/dig.out.fixed.good       X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good1     X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good10    X       2006
@@ -1775,23 +1769,24 @@
 ./bin/tests/system/rrsetorder/dig.out.random.good7     X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good8     X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good9     X       2006
-./bin/tests/system/rrsetorder/ns1/named.conf   CONF-C  2006,2007,2013
+./bin/tests/system/rrsetorder/ns1/named.conf.in        CONF-C  2006,2007,2013,2018
 ./bin/tests/system/rrsetorder/ns1/root.db      ZONE    2006,2007,2012
-./bin/tests/system/rrsetorder/ns2/named.conf   CONF-C  2006,2007
-./bin/tests/system/rrsetorder/ns3/named.conf   CONF-C  2006,2007
-./bin/tests/system/rrsetorder/ns4/named.conf   CONF-C  2015
-./bin/tests/system/rrsetorder/tests.sh         SH      2006,2007,2008,2011,2012,2014,2015,2016
+./bin/tests/system/rrsetorder/ns2/named.conf.in        CONF-C  2006,2007,2018
+./bin/tests/system/rrsetorder/ns3/named.conf.in        CONF-C  2006,2007,2018
+./bin/tests/system/rrsetorder/ns4/named.conf.in        CONF-C  2015,2018
+./bin/tests/system/rrsetorder/setup.sh         SH      2018
+./bin/tests/system/rrsetorder/tests.sh         SH      2006,2007,2008,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/rsabigexponent/.gitignore   X       2015
 ./bin/tests/system/rsabigexponent/Makefile.in  MAKE    2012,2015
 ./bin/tests/system/rsabigexponent/bigkey.c     C       2012,2014,2015
-./bin/tests/system/rsabigexponent/clean.sh     SH      2012,2014
+./bin/tests/system/rsabigexponent/clean.sh     SH      2012,2014,2018
 ./bin/tests/system/rsabigexponent/conf/bad01.conf      CONF-C  2012
 ./bin/tests/system/rsabigexponent/conf/bad02.conf      CONF-C  2012
 ./bin/tests/system/rsabigexponent/conf/bad03.conf      CONF-C  2012
 ./bin/tests/system/rsabigexponent/conf/good01.conf     CONF-C  2012
 ./bin/tests/system/rsabigexponent/conf/good02.conf     CONF-C  2012
 ./bin/tests/system/rsabigexponent/conf/good03.conf     CONF-C  2012
-./bin/tests/system/rsabigexponent/ns1/named.conf       CONF-C  2012
+./bin/tests/system/rsabigexponent/ns1/named.conf.in    CONF-C  2012,2018
 ./bin/tests/system/rsabigexponent/ns1/root.db.in       ZONE    2012
 ./bin/tests/system/rsabigexponent/ns1/sign.sh  SH      2012,2014
 ./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.key  X       2012
@@ -1801,24 +1796,25 @@
 ./bin/tests/system/rsabigexponent/ns2/dsset-example.in X       2012
 ./bin/tests/system/rsabigexponent/ns2/example.db.bad   ZONE    2012
 ./bin/tests/system/rsabigexponent/ns2/example.db.in    ZONE    2012
-./bin/tests/system/rsabigexponent/ns2/named.conf       CONF-C  2012
+./bin/tests/system/rsabigexponent/ns2/named.conf.in    CONF-C  2012,2018
 ./bin/tests/system/rsabigexponent/ns2/sign.sh  SH      2012,2014
-./bin/tests/system/rsabigexponent/ns3/named.conf       CONF-C  2012
-./bin/tests/system/rsabigexponent/prereq.sh    SH      2012,2014
-./bin/tests/system/rsabigexponent/setup.sh     SH      2012,2014
-./bin/tests/system/rsabigexponent/tests.sh     SH      2012,2016
-./bin/tests/system/run.sh                      SH      2000,2001,2004,2007,2010,2012,2014,2015,2016,2017
-./bin/tests/system/runall.sh                   SH      2000,2001,2004,2007,2010,2011,2012,2014,2015
-./bin/tests/system/runtime/clean.sh            SH      2017
-./bin/tests/system/runtime/ns2/named-alt1.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named-alt2.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named-alt3.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named-alt4.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named-alt5.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named-alt6.conf CONF-C  2017
-./bin/tests/system/runtime/ns2/named1.conf     CONF-C  2017
-./bin/tests/system/runtime/setup.sh            SH      2017
-./bin/tests/system/runtime/tests.sh            SH      2017
+./bin/tests/system/rsabigexponent/ns3/named.conf.in    CONF-C  2012,2018
+./bin/tests/system/rsabigexponent/prereq.sh    SH      2012,2014,2018
+./bin/tests/system/rsabigexponent/setup.sh     SH      2012,2014,2018
+./bin/tests/system/rsabigexponent/tests.sh     SH      2012,2016,2018
+./bin/tests/system/run.sh                      SH      2000,2001,2004,2007,2010,2012,2014,2015,2016,2017,2018
+./bin/tests/system/runall.sh                   SH      2000,2001,2004,2007,2010,2011,2012,2014,2015,2018
+./bin/tests/system/runsequential.sh            SH      2018
+./bin/tests/system/runtime/clean.sh            SH      2017,2018
+./bin/tests/system/runtime/ns2/named-alt1.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named-alt2.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named-alt3.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named-alt4.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named-alt5.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named-alt6.conf.in      CONF-C  2017,2018
+./bin/tests/system/runtime/ns2/named1.conf.in  CONF-C  2017,2018
+./bin/tests/system/runtime/setup.sh            SH      2017,2018
+./bin/tests/system/runtime/tests.sh            SH      2017,2018
 ./bin/tests/system/send.pl                     PERL    2001,2004,2007,2011,2012
 ./bin/tests/system/setup.sh                    SH      2000,2001,2004,2007,2012,2014
 ./bin/tests/system/smartsign/child.db          ZONE    2010
@@ -1826,19 +1822,21 @@
 ./bin/tests/system/smartsign/parent.db         ZONE    2010
 ./bin/tests/system/smartsign/prereq.sh         SH      2010,2012,2014
 ./bin/tests/system/smartsign/setup.sh          SH      2010,2012,2014
-./bin/tests/system/smartsign/tests.sh          SH      2010,2011,2012,2014,2016,2017
-./bin/tests/system/sortlist/clean.sh           SH      2000,2001,2004,2007,2009,2012,2015
+./bin/tests/system/smartsign/tests.sh          SH      2010,2011,2012,2014,2016,2017,2018
+./bin/tests/system/sortlist/clean.sh           SH      2000,2001,2004,2007,2009,2012,2015,2018
 ./bin/tests/system/sortlist/ns1/example.db     ZONE    2000,2001,2004,2007
-./bin/tests/system/sortlist/ns1/named.conf     CONF-C  2000,2001,2004,2007
+./bin/tests/system/sortlist/ns1/named.conf.in  CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/sortlist/ns1/root.db                ZONE    2000,2001,2004,2007
-./bin/tests/system/sortlist/tests.sh           SH      2000,2001,2004,2007,2012,2016
-./bin/tests/system/spf/clean.sh                        SH      2013
-./bin/tests/system/spf/ns1/named.conf          CONF-C  2013
+./bin/tests/system/sortlist/setup.sh           SH      2018
+./bin/tests/system/sortlist/tests.sh           SH      2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/spf/clean.sh                        SH      2013,2018
+./bin/tests/system/spf/ns1/named.conf.in       CONF-C  2013,2018
 ./bin/tests/system/spf/ns1/spf.db              ZONE    2013
-./bin/tests/system/spf/tests.sh                        SH      2013,2014,2016
-./bin/tests/system/start.pl                    SH      2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/spf/setup.sh                        SH      2018
+./bin/tests/system/spf/tests.sh                        SH      2013,2014,2016,2018
+./bin/tests/system/start.pl                    SH      2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/start.sh                    SH      2000,2001,2004,2007,2012
-./bin/tests/system/staticstub/clean.sh         SH      2010,2012,2014,2015
+./bin/tests/system/staticstub/clean.sh         SH      2010,2012,2014,2015,2018
 ./bin/tests/system/staticstub/conf/bad01.conf  CONF-C  2010
 ./bin/tests/system/staticstub/conf/bad02.conf  CONF-C  2010
 ./bin/tests/system/staticstub/conf/bad03.conf  CONF-C  2010
@@ -1856,28 +1854,24 @@
 ./bin/tests/system/staticstub/conf/good04.conf CONF-C  2010
 ./bin/tests/system/staticstub/conf/good05.conf CONF-C  2010
 ./bin/tests/system/staticstub/knowngood.dig.out.rec    X       2010
-./bin/tests/system/staticstub/ns1/named.conf   CONF-C  2010
+./bin/tests/system/staticstub/ns1/named.conf.in        CONF-C  2010,2018
 ./bin/tests/system/staticstub/ns1/root.db      ZONE    2010
-./bin/tests/system/staticstub/ns2/named.conf.in        CONF-C  2010,2015
+./bin/tests/system/staticstub/ns2/named.conf.in        CONF-C  2010,2015,2018
 ./bin/tests/system/staticstub/ns3/example.db.in        ZONE    2010
 ./bin/tests/system/staticstub/ns3/example.org.db       ZONE    2010
-./bin/tests/system/staticstub/ns3/named.conf.in        CONF-C  2010,2015
+./bin/tests/system/staticstub/ns3/named.conf.in        CONF-C  2010,2015,2018
 ./bin/tests/system/staticstub/ns3/sign.sh      SH      2010,2012,2014,2015
 ./bin/tests/system/staticstub/ns3/undelegated.db.in    ZONE    2015
 ./bin/tests/system/staticstub/ns4/example.com.db       ZONE    2010
 ./bin/tests/system/staticstub/ns4/example.info.db      ZONE    2010
 ./bin/tests/system/staticstub/ns4/example.org.db       ZONE    2010
-./bin/tests/system/staticstub/ns4/named.conf   CONF-C  2010
+./bin/tests/system/staticstub/ns4/named.conf.in        CONF-C  2010,2018
 ./bin/tests/system/staticstub/ns4/sign.sh      SH      2010,2012,2014
 ./bin/tests/system/staticstub/ns4/sub.example.db.in    ZONE    2010
 ./bin/tests/system/staticstub/prereq.sh                SH      2014
-./bin/tests/system/staticstub/setup.sh         SH      2010,2012,2014
-./bin/tests/system/staticstub/tests.sh         SH      2010,2011,2012,2015,2016
-./bin/tests/system/statistics/clean.sh         SH      2015
-./bin/tests/system/statistics/ns1/named.conf   CONF-C  2015
-./bin/tests/system/statistics/ns1/zone.db      ZONE    2015
-./bin/tests/system/statistics/tests.sh         SH      2015,2016
-./bin/tests/system/stop.pl                     SH      2001,2004,2005,2006,2007,2012
+./bin/tests/system/staticstub/setup.sh         SH      2010,2012,2014,2018
+./bin/tests/system/staticstub/tests.sh         SH      2010,2011,2012,2015,2016,2018
+./bin/tests/system/stop.pl                     SH      2001,2004,2005,2006,2007,2012,2018
 ./bin/tests/system/stop.sh                     SH      2000,2001,2004,2007,2012
 ./bin/tests/system/stress/clean.sh             SH      2000,2001,2004,2007,2012
 ./bin/tests/system/stress/ns1/named.conf       CONF-C  2000,2001,2004,2007
@@ -1889,19 +1883,21 @@
 ./bin/tests/system/stress/setup.sh             SH      2000,2001,2004,2007,2012
 ./bin/tests/system/stress/tests.sh             SH      2000,2001,2004,2007,2012,2014,2015,2016
 ./bin/tests/system/stress/update.pl            PERL    2000,2001,2004,2007,2012
-./bin/tests/system/stub/clean.sh               SH      2000,2001,2004,2007,2012,2015
+./bin/tests/system/stub/clean.sh               SH      2000,2001,2004,2007,2012,2015,2018
 ./bin/tests/system/stub/knowngood.dig.out.norec        X       2000,2001
 ./bin/tests/system/stub/knowngood.dig.out.rec  X       2000,2001
-./bin/tests/system/stub/ns1/named.conf         CONF-C  2000,2001,2004,2007
+./bin/tests/system/stub/ns1/named.conf.in      CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/stub/ns1/root.db            ZONE    2000,2001,2004,2007
 ./bin/tests/system/stub/ns2/child.example.db   ZONE    2000,2001,2004,2007
-./bin/tests/system/stub/ns2/named.conf         CONF-C  2000,2001,2004,2007
+./bin/tests/system/stub/ns2/named.conf.in      CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/stub/ns3/example.db         ZONE    2000,2001,2004,2007
-./bin/tests/system/stub/ns3/named.conf         CONF-C  2000,2001,2004,2007
-./bin/tests/system/stub/tests.sh               SH      2000,2001,2004,2007,2011,2012,2016
+./bin/tests/system/stub/ns3/named.conf.in      CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/stub/setup.sh               SH      2018
+./bin/tests/system/stub/tests.sh               SH      2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/testcrypto.sh               SH      2014,2016,2017
 ./bin/tests/system/testsock.pl                 PERL    2000,2001,2004,2007,2010,2011,2012,2013
 ./bin/tests/system/testsock6.pl                        PERL    2010,2012,2014
+./bin/tests/system/testsummary.sh              SH      2018
 ./bin/tests/system/tkey/Makefile.in            MAKE    2001,2002,2004,2007,2009,2012,2015
 ./bin/tests/system/tkey/clean.sh               SH      2001,2004,2007,2011,2012,2013,2014,2015
 ./bin/tests/system/tkey/keycreate.c            C       2001,2004,2005,2007,2009,2011,2012,2014,2015
@@ -1912,22 +1908,22 @@
 ./bin/tests/system/tkey/prereq.sh              SH      2001,2004,2006,2007,2009,2012,2014
 ./bin/tests/system/tkey/setup.sh               SH      2001,2004,2007,2009,2012,2013,2014
 ./bin/tests/system/tkey/tests.sh               SH      2001,2004,2007,2009,2011,2012,2013,2014,2016
-./bin/tests/system/tsig/clean.sh               SH      2005,2006,2007,2012,2016
+./bin/tests/system/tsig/clean.sh               SH      2005,2006,2007,2012,2016,2018
 ./bin/tests/system/tsig/ns1/example.db         ZONE    2005,2006,2007,2009,2012
-./bin/tests/system/tsig/ns1/named.conf         CONF-C  2005,2006,2007
-./bin/tests/system/tsig/setup.sh               SH      2016
-./bin/tests/system/tsig/tests.sh               SH      2005,2006,2007,2011,2012,2016
-./bin/tests/system/tsiggss/authsock.pl         PERL    2011,2012
-./bin/tests/system/tsiggss/clean.sh            X       2010,2011,2014,2015
+./bin/tests/system/tsig/ns1/named.conf.in      CONF-C  2005,2006,2007,2018
+./bin/tests/system/tsig/setup.sh               SH      2016,2018
+./bin/tests/system/tsig/tests.sh               SH      2005,2006,2007,2011,2012,2016,2018
+./bin/tests/system/tsiggss/authsock.pl         PERL    2011,2012,2018
+./bin/tests/system/tsiggss/clean.sh            X       2010,2011,2014,2015,2018
 ./bin/tests/system/tsiggss/ns1/administrator.ccache    X       2010
 ./bin/tests/system/tsiggss/ns1/dns.keytab      X       2010
 ./bin/tests/system/tsiggss/ns1/example.nil.db.in       X       2011
-./bin/tests/system/tsiggss/ns1/named.conf      CONF-C  2010,2011
+./bin/tests/system/tsiggss/ns1/named.conf.in   CONF-C  2010,2011,2018
 ./bin/tests/system/tsiggss/ns1/testdenied.ccache       X       2010
-./bin/tests/system/tsiggss/prereq.sh           SH      2010,2011,2012,2014,2016
-./bin/tests/system/tsiggss/setup.sh            SH      2010,2011,2012,2014
-./bin/tests/system/tsiggss/tests.sh            X       2010,2011,2014,2016,2017
-./bin/tests/system/unknown/clean.sh            SH      2000,2001,2004,2007,2012,2013,2015
+./bin/tests/system/tsiggss/prereq.sh           SH      2010,2011,2012,2014,2016,2018
+./bin/tests/system/tsiggss/setup.sh            SH      2010,2011,2012,2014,2018
+./bin/tests/system/tsiggss/tests.sh            X       2010,2011,2014,2016,2017,2018
+./bin/tests/system/unknown/clean.sh            SH      2000,2001,2004,2007,2012,2013,2015,2018
 ./bin/tests/system/unknown/large.out           X       2012
 ./bin/tests/system/unknown/ns1/broken1.db      ZONE    2000,2001,2004,2007
 ./bin/tests/system/unknown/ns1/broken2.db      ZONE    2000,2001,2004,2007
@@ -1938,46 +1934,37 @@
 ./bin/tests/system/unknown/ns1/example-class10.db      ZONE    2000,2001,2004,2007
 ./bin/tests/system/unknown/ns1/example-in.db   ZONE    2000,2001,2004,2007,2011,2012
 ./bin/tests/system/unknown/ns1/large.db                ZONE    2012
-./bin/tests/system/unknown/ns1/named.conf      CONF-C  2000,2001,2004,2007
-./bin/tests/system/unknown/ns2/named.conf      CONF-C  2012
-./bin/tests/system/unknown/ns3/named.conf      CONF-C  2012
+./bin/tests/system/unknown/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/unknown/ns2/named.conf.in   CONF-C  2012,2018
+./bin/tests/system/unknown/ns3/named.conf.in   CONF-C  2012,2018
 ./bin/tests/system/unknown/ns3/sign.sh         SH      2012,2014
 ./bin/tests/system/unknown/prereq.sh           SH      2014
-./bin/tests/system/unknown/setup.sh            SH      2012,2014
-./bin/tests/system/unknown/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2016
+./bin/tests/system/unknown/setup.sh            SH      2012,2014,2018
+./bin/tests/system/unknown/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/unknown/zones/nan.bad       ZONE    2013
-./bin/tests/system/upforwd/ans4/ans.pl         PERL    2011,2012
-./bin/tests/system/upforwd/clean.sh            SH      2000,2001,2004,2007,2011,2012,2014,2015
+./bin/tests/system/upforwd/ans4/ans.pl         PERL    2011,2012,2018
+./bin/tests/system/upforwd/clean.sh            SH      2000,2001,2004,2007,2011,2012,2014,2015,2018
 ./bin/tests/system/upforwd/knowngood.after1    X       2000,2001
 ./bin/tests/system/upforwd/knowngood.after2    X       2000,2001
 ./bin/tests/system/upforwd/knowngood.before    X       2000,2001
 ./bin/tests/system/upforwd/knowngood.ns2.before        X       2000,2001
 ./bin/tests/system/upforwd/ns1/example1.db     ZONE    2000,2001,2004,2007
-./bin/tests/system/upforwd/ns1/named.conf      CONF-C  2000,2001,2004,2007,2014
-./bin/tests/system/upforwd/ns2/named.conf      CONF-C  2000,2001,2004,2007,2014
-./bin/tests/system/upforwd/ns3/named.conf      CONF-C  2000,2001,2004,2007,2011,2014
+./bin/tests/system/upforwd/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2014,2018
+./bin/tests/system/upforwd/ns2/named.conf.in   CONF-C  2000,2001,2004,2007,2014,2018
+./bin/tests/system/upforwd/ns3/named.conf.in   CONF-C  2000,2001,2004,2007,2011,2014,2018
 ./bin/tests/system/upforwd/ns3/nomaster.db     ZONE    2011
-./bin/tests/system/upforwd/prereq.sh           SH      2012,2014
-./bin/tests/system/upforwd/setup.sh            SH      2000,2001,2004,2007,2011,2012,2014
-./bin/tests/system/upforwd/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016
-./bin/tests/system/v6synth/clean.sh            SH      2001,2004,2007,2012
-./bin/tests/system/v6synth/ns1/named.conf      CONF-C  2001,2004,2007
-./bin/tests/system/v6synth/ns1/root.db         ZONE    2001,2004,2007
-./bin/tests/system/v6synth/ns2/example.db      ZONE    2001,2004,2007
-./bin/tests/system/v6synth/ns2/ip6.arpa.db     ZONE    2001,2002,2004,2007
-./bin/tests/system/v6synth/ns2/ip6.int.db      ZONE    2001,2004,2007
-./bin/tests/system/v6synth/ns2/named.conf      CONF-C  2001,2004,2007
-./bin/tests/system/v6synth/ns3/named.conf      CONF-C  2001,2004,2007
-./bin/tests/system/v6synth/tests.sh            SH      2001,2004,2007,2012,2016
+./bin/tests/system/upforwd/prereq.sh           SH      2012,2014,2018
+./bin/tests/system/upforwd/setup.sh            SH      2000,2001,2004,2007,2011,2012,2014,2018
+./bin/tests/system/upforwd/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/verify/.gitignore           X       2012
 ./bin/tests/system/verify/clean.sh             SH      2012,2014
 ./bin/tests/system/verify/prereq.sh            SH      2014
 ./bin/tests/system/verify/setup.sh             SH      2012,2014
-./bin/tests/system/verify/tests.sh             SH      2012,2013,2016,2017
-./bin/tests/system/verify/zones/genzones.sh    SH      2012,2013,2014
+./bin/tests/system/verify/tests.sh             SH      2012,2013,2016,2017,2018
+./bin/tests/system/verify/zones/genzones.sh    SH      2012,2013,2014,2018
 ./bin/tests/system/verify/zones/unsigned.db    ZONE    2012,2016
-./bin/tests/system/views/clean.sh              SH      2000,2001,2004,2005,2007,2012,2014,2015
-./bin/tests/system/views/ns1/named.conf                CONF-C  2000,2001,2004,2007
+./bin/tests/system/views/clean.sh              SH      2000,2001,2004,2005,2007,2012,2014,2015,2018
+./bin/tests/system/views/ns1/named.conf.in     CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/views/ns1/root.db           ZONE    2000,2001,2004,2007
 ./bin/tests/system/views/ns2/.gitignore                X       2012
 ./bin/tests/system/views/ns2/example1.db       ZONE    2000,2001,2004,2007
@@ -1985,89 +1972,89 @@
 ./bin/tests/system/views/ns2/external/inline.db        ZONE    2014
 ./bin/tests/system/views/ns2/internal.db       ZONE    2000,2001,2004,2007
 ./bin/tests/system/views/ns2/internal/inline.db        ZONE    2014
-./bin/tests/system/views/ns2/named1.conf       CONF-C  2000,2001,2004,2007
-./bin/tests/system/views/ns2/named2.conf       CONF-C  2000,2001,2004,2007,2014
+./bin/tests/system/views/ns2/named1.conf.in    CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/views/ns2/named2.conf.in    CONF-C  2000,2001,2004,2007,2014,2018
 ./bin/tests/system/views/ns3/.gitignore                X       2012
 ./bin/tests/system/views/ns3/internal.db       ZONE    2000,2001,2004,2007
-./bin/tests/system/views/ns3/named1.conf       CONF-C  2000,2001,2004,2007
-./bin/tests/system/views/ns3/named2.conf       CONF-C  2000,2001,2004,2007
-./bin/tests/system/views/setup.sh              SH      2000,2001,2004,2007,2012,2014
-./bin/tests/system/views/tests.sh              SH      2000,2001,2004,2007,2012,2014,2016
-./bin/tests/system/wildcard/clean.sh           SH      2012,2013,2014
+./bin/tests/system/views/ns3/named1.conf.in    CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/views/ns3/named2.conf.in    CONF-C  2000,2001,2004,2007,2018
+./bin/tests/system/views/setup.sh              SH      2000,2001,2004,2007,2012,2014,2018
+./bin/tests/system/views/tests.sh              SH      2000,2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/wildcard/clean.sh           SH      2012,2013,2014,2018
 ./bin/tests/system/wildcard/ns1/dlv.db.in      ZONE    2013
-./bin/tests/system/wildcard/ns1/named.conf     CONF-C  2012,2013
+./bin/tests/system/wildcard/ns1/named.conf.in  CONF-C  2012,2013,2018
 ./bin/tests/system/wildcard/ns1/nsec.db.in     ZONE    2012,2013
 ./bin/tests/system/wildcard/ns1/nsec3.db.in    ZONE    2012,2013
 ./bin/tests/system/wildcard/ns1/private.nsec.db.in     ZONE    2012,2013
 ./bin/tests/system/wildcard/ns1/private.nsec3.db.in    ZONE    2012,2013
 ./bin/tests/system/wildcard/ns1/root.db.in     ZONE    2012,2013
-./bin/tests/system/wildcard/ns1/sign.sh                SH      2012,2013,2014
+./bin/tests/system/wildcard/ns1/sign.sh                SH      2012,2013,2014,2018
 ./bin/tests/system/wildcard/ns2/hints          ZONE    2012
-./bin/tests/system/wildcard/ns2/named.conf     CONF-C  2012
+./bin/tests/system/wildcard/ns2/named.conf.in  CONF-C  2012,2018
 ./bin/tests/system/wildcard/ns3/hints          ZONE    2012
-./bin/tests/system/wildcard/ns3/named.conf     CONF-C  2012
-./bin/tests/system/wildcard/ns4/named.conf     CONF-C  2012
+./bin/tests/system/wildcard/ns3/named.conf.in  CONF-C  2012,2018
+./bin/tests/system/wildcard/ns4/named.conf.in  CONF-C  2012,2018
 ./bin/tests/system/wildcard/ns5/hints          ZONE    2013
-./bin/tests/system/wildcard/ns5/named.conf     CONF-C  2013
+./bin/tests/system/wildcard/ns5/named.conf.in  CONF-C  2013,2018
 ./bin/tests/system/wildcard/prereq.sh          SH      2014
-./bin/tests/system/wildcard/setup.sh           SH      2012,2014
-./bin/tests/system/wildcard/tests.sh           SH      2012,2013,2016
+./bin/tests/system/wildcard/setup.sh           SH      2012,2014,2018
+./bin/tests/system/wildcard/tests.sh           SH      2012,2013,2016,2018
 ./bin/tests/system/xfer/ans5/badkeydata                X       2011
 ./bin/tests/system/xfer/ans5/goodaxfr          X       2011
 ./bin/tests/system/xfer/ans5/partial           X       2011
 ./bin/tests/system/xfer/ans5/unknownkey                X       2011
 ./bin/tests/system/xfer/ans5/unsigned          X       2011
 ./bin/tests/system/xfer/ans5/wrongkey          X       2011
-./bin/tests/system/xfer/clean.sh               SH      2000,2001,2004,2007,2011,2012,2013,2016
+./bin/tests/system/xfer/clean.sh               SH      2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/xfer/dig1.good              X       2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/xfer/dig2.good              X       2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/xfer/ns1/axfr-too-big.db    ZONE    2016
 ./bin/tests/system/xfer/ns1/ixfr-too-big.db.in ZONE    2016
-./bin/tests/system/xfer/ns1/named.conf         CONF-C  2000,2001,2004,2007,2011,2016
+./bin/tests/system/xfer/ns1/named.conf.in      CONF-C  2000,2001,2004,2007,2011,2016,2018
 ./bin/tests/system/xfer/ns1/root.db            ZONE    2000,2001,2004,2007
-./bin/tests/system/xfer/ns2/named.conf         CONF-C  2000,2001,2004,2005,2007,2013
+./bin/tests/system/xfer/ns2/named.conf.in      CONF-C  2000,2001,2004,2005,2007,2013,2018
 ./bin/tests/system/xfer/ns2/slave.db.in                ZONE    2013
-./bin/tests/system/xfer/ns3/named.conf         CONF-C  2000,2001,2004,2007,2011
-./bin/tests/system/xfer/ns4/named.conf.base    CONF-C  2011
+./bin/tests/system/xfer/ns3/named.conf.in      CONF-C  2000,2001,2004,2007,2011,2018
+./bin/tests/system/xfer/ns4/named.conf.base    CONF-C  2011,2018
 ./bin/tests/system/xfer/ns4/root.db.in         ZONE    2011
-./bin/tests/system/xfer/ns6/named.conf         CONF-C  2011,2016
-./bin/tests/system/xfer/ns7/named.conf         CONF-C  2011
-./bin/tests/system/xfer/prereq.sh              SH      2011,2012,2014
-./bin/tests/system/xfer/setup.sh               SH      2001,2002,2004,2007,2011,2012,2013,2014,2016
-./bin/tests/system/xfer/tests.sh               SH      2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016
-./bin/tests/system/xferquota/clean.sh          SH      2000,2001,2004,2007,2012,2015
+./bin/tests/system/xfer/ns6/named.conf.in      CONF-C  2011,2016,2018
+./bin/tests/system/xfer/ns7/named.conf.in      CONF-C  2011,2018
+./bin/tests/system/xfer/prereq.sh              SH      2011,2012,2014,2018
+./bin/tests/system/xfer/setup.sh               SH      2001,2002,2004,2007,2011,2012,2013,2014,2016,2018
+./bin/tests/system/xfer/tests.sh               SH      2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/xferquota/clean.sh          SH      2000,2001,2004,2007,2012,2015,2018
 ./bin/tests/system/xferquota/ns1/changing1.db  ZONE    2000,2001,2004,2007
 ./bin/tests/system/xferquota/ns1/changing2.db  ZONE    2000,2001,2004,2007
-./bin/tests/system/xferquota/ns1/named.conf    CONF-C  2000,2001,2004,2007
+./bin/tests/system/xferquota/ns1/named.conf.in CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/xferquota/ns1/root.db       ZONE    2000,2001,2004,2007
 ./bin/tests/system/xferquota/ns2/example.db    ZONE    2000,2001,2002,2003,2004,2007,2009
-./bin/tests/system/xferquota/ns2/named.conf    CONF-C  2000,2001,2004,2007
+./bin/tests/system/xferquota/ns2/named.conf.in CONF-C  2000,2001,2004,2007,2018
 ./bin/tests/system/xferquota/setup.pl          PERL    2000,2001,2004,2007,2011,2012
-./bin/tests/system/xferquota/setup.sh          SH      2000,2001,2004,2007,2012
-./bin/tests/system/xferquota/tests.sh          SH      2000,2001,2004,2007,2012,2016
-./bin/tests/system/zero/ans5/ans.pl            PERL    2016
-./bin/tests/system/zero/clean.sh               SH      2013,2015
-./bin/tests/system/zero/ns1/named.conf         CONF-C  2013
+./bin/tests/system/xferquota/setup.sh          SH      2000,2001,2004,2007,2012,2018
+./bin/tests/system/xferquota/tests.sh          SH      2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/zero/ans5/ans.pl            PERL    2016,2018
+./bin/tests/system/zero/clean.sh               SH      2013,2015,2018
+./bin/tests/system/zero/ns1/named.conf.in      CONF-C  2013,2018
 ./bin/tests/system/zero/ns1/root.db            ZONE    2013,2016
-./bin/tests/system/zero/ns2/named.conf         CONF-C  2013,2016
+./bin/tests/system/zero/ns2/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/zero/ns2/tld.db             ZONE    2016
-./bin/tests/system/zero/ns3/named.conf         CONF-C  2013
+./bin/tests/system/zero/ns3/named.conf.in      CONF-C  2013,2018
 ./bin/tests/system/zero/ns3/root.hint          ZONE    2013
-./bin/tests/system/zero/ns4/named.conf         CONF-C  2013,2016
+./bin/tests/system/zero/ns4/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/zero/ns4/one.tld.db         ZONE    2016
-./bin/tests/system/zero/setup.sh               SH      2013,2014
-./bin/tests/system/zero/tests.sh               SH      2013,2016,2017
+./bin/tests/system/zero/setup.sh               SH      2013,2014,2018
+./bin/tests/system/zero/tests.sh               SH      2013,2016,2017,2018
 ./bin/tests/system/zonechecks/a.db             ZONE    2004,2007
 ./bin/tests/system/zonechecks/aaaa.db          ZONE    2004,2007
-./bin/tests/system/zonechecks/clean.sh         SH      2004,2007,2012,2015
+./bin/tests/system/zonechecks/clean.sh         SH      2004,2007,2012,2015,2018
 ./bin/tests/system/zonechecks/cname.db         ZONE    2004,2007
 ./bin/tests/system/zonechecks/dname.db         ZONE    2004,2007
 ./bin/tests/system/zonechecks/noaddress.db     ZONE    2004,2007
-./bin/tests/system/zonechecks/ns1/named.conf   CONF-C  2014
+./bin/tests/system/zonechecks/ns1/named.conf.in        CONF-C  2014,2018
 ./bin/tests/system/zonechecks/nxdomain.db      ZONE    2004,2007
 ./bin/tests/system/zonechecks/prereq.sh                SH      2014
-./bin/tests/system/zonechecks/setup.sh         SH      2014
-./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2014,2016
+./bin/tests/system/zonechecks/setup.sh         SH      2014,2018
+./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2014,2016,2018
 ./bin/tests/t_api.pl                           PERL    1999,2000,2001,2004,2007,2012
 ./bin/tests/task_test.c                                C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2018
 ./bin/tests/tasks/Makefile.in                  MAKE    1998,1999,2000,2001,2002,2004,2007,2009,2012
@@ -2271,7 +2258,7 @@
 ./contrib/dlz/bin/.gitignore                   X       2014
 ./contrib/dlz/bin/dlzbdb/Makefile.in           X       2005,2007,2009,2011,2012,2015
 ./contrib/dlz/bin/dlzbdb/dlzbdb.c              X       2005
-./contrib/dlz/config.dlz.in                    X       2005,2006,2008,2010,2011,2014,2016,2017
+./contrib/dlz/config.dlz.in                    X       2005,2006,2008,2010,2011,2014,2016,2017,2018
 ./contrib/dlz/drivers/.gitignore               X       2012
 ./contrib/dlz/drivers/dlz_bdb_driver.c         X       2005,2008,2010,2011
 ./contrib/dlz/drivers/dlz_bdbhpt_driver.c      X       2005,2010,2011
@@ -2902,7 +2889,7 @@
 ./lib/dns/lookup.c                             C       2000,2001,2003,2004,2005,2007,2013
 ./lib/dns/master.c                             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/masterdump.c                         C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/message.c                            C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/message.c                            C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/name.c                               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/ncache.c                             C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011,2012,2013,2015,2016
 ./lib/dns/nsec.c                               C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015
@@ -3111,7 +3098,7 @@
 ./lib/dns/tests/Atffile                                X       2011,2017
 ./lib/dns/tests/Kdh.+002+18602.key             X       2014
 ./lib/dns/tests/Kyuafile                       X       2017
-./lib/dns/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017
+./lib/dns/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/acl_test.c                     C       2016
 ./lib/dns/tests/db_test.c                      C       2013,2015
 ./lib/dns/tests/dbdiff_test.c                  C       2011,2012,2017
@@ -3247,7 +3234,7 @@
 ./lib/irs/resconf.c                            C       2009,2011,2012,2014,2015,2016
 ./lib/irs/tests/Atffile                                X       2016,2017
 ./lib/irs/tests/Kyuafile                       X       2017
-./lib/irs/tests/Makefile.in                    MAKE    2016,2017
+./lib/irs/tests/Makefile.in                    MAKE    2016,2017,2018
 ./lib/irs/tests/resconf_test.c                 C       2016
 ./lib/irs/tests/testdata/domain.conf           CONF-SH 2016
 ./lib/irs/tests/testdata/nameserver-v4.conf    CONF-SH 2016
@@ -3465,7 +3452,7 @@
 ./lib/isc/taskpool.c                           C       1999,2000,2001,2004,2005,2007,2011,2012,2013
 ./lib/isc/tests/Atffile                                X       2011,2017
 ./lib/isc/tests/Kyuafile                       X       2017
-./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017
+./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/tests/counter_test.c                 C       2014
 ./lib/isc/tests/errno_test.c                   C       2016
 ./lib/isc/tests/hash_test.c                    C       2011,2012,2014,2015,2016,2017