[master] copyrights

diff --git a/bin/tests/system/checkconf/check-dlv-ksk-key.conf b/bin/tests/system/checkconf/check-dlv-ksk-key.conf
index 1ee566d13f45c321e3c8d20dafea761674f29d3d..9f6b70f14dbb812f732241c1f09ac4a36a090e0f 100644 (file)
--- a/bin/tests/system/checkconf/check-dlv-ksk-key.conf
+++ b/bin/tests/system/checkconf/check-dlv-ksk-key.conf
@@ -1,6 +1,14 @@
+/*
+ * 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/.
+ */
+
 trusted-keys {
        dlv.isc.org 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWE
-               n4MxDCE1+lLy2brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8
+               n4MxDCE1+lLy2brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8
                +jAGl2FZLK8t+1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ
                2kJb56dhgMde5ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnG
                xPPEmHAte/URkY62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mR

diff --git a/bin/tests/system/checkconf/check-root-ksk-2010.conf b/bin/tests/system/checkconf/check-root-ksk-2010.conf
index 54a1b9ff0b7557935cbebd3758f707899f669501..560b545158a93fd09cfee42df3949ab01eab52e3 100644 (file)
--- a/bin/tests/system/checkconf/check-root-ksk-2010.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-2010.conf
@@ -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/.
+ */
+
 trusted-keys {
-        # This key (19036) is to be phased out starting in 2017. It will
-        # remain in the root zone for some time after its successor key
-        # has been added. It will remain this file until it is removed from
-        # the root zone.
-        . 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
-                FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
-                bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
-                X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
-                W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
-                Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
-                QxA+Uk1ihz0=";
+       # This key (19036) is to be phased out starting in 2017. It will
+       # remain in the root zone for some time after its successor key
+       # has been added. It will remain this file until it is removed from
+       # the root zone.
+       . 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
+               FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
+               bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
+               X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
+               W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
+               Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
+               QxA+Uk1ihz0=";
 };

diff --git a/bin/tests/system/checkconf/check-root-ksk-2017.conf b/bin/tests/system/checkconf/check-root-ksk-2017.conf
index 7d83d4b16cfec55f150b00811fbe28d5fab9507e..bec3c8ed4f95a3db4e8fe6b5f0aea5a2d8d7cfad 100644 (file)
--- a/bin/tests/system/checkconf/check-root-ksk-2017.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-2017.conf
@@ -1,16 +1,24 @@
+/*
+ * 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/.
+ */
+
 trusted-keys {
-        # This key (20326) was published in the root zone in 2017.
-        # Servers which were already using the old key (19036) should
-        # roll seamlessly to this new one via RFC 5011 rollover. Servers
-        # being set up for the first time can use the contents of this
-        # file as initializing keys; thereafter, the keys in the
-        # managed key database will be trusted and maintained
-        # automatically.
-        . 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
-                +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
-                ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
-                0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
-                oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
-                RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
-                R1AkUTV74bU=";
+       # This key (20326) was published in the root zone in 2017.
+       # Servers which were already using the old key (19036) should
+       # roll seamlessly to this new one via RFC 5011 rollover. Servers
+       # being set up for the first time can use the contents of this
+       # file as initializing keys; thereafter, the keys in the
+       # managed key database will be trusted and maintained
+       # automatically.
+       . 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+               +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+               ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+               0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+               oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+               RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+               R1AkUTV74bU=";
 };

diff --git a/bin/tests/system/checkconf/check-root-ksk-both.conf b/bin/tests/system/checkconf/check-root-ksk-both.conf
index 091c9afbefc22dfba8d1e418a3eec487ee773bbf..09af02dd89c79bea67683c764864810b9c7cedf4 100644 (file)
--- a/bin/tests/system/checkconf/check-root-ksk-both.conf
+++ b/bin/tests/system/checkconf/check-root-ksk-both.conf
@@ -1,28 +1,36 @@
+/*
+ * 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/.
+ */
+
 trusted-keys {
-        # This key (19036) is to be phased out starting in 2017. It will
-        # remain in the root zone for some time after its successor key
-        # has been added. It will remain this file until it is removed from
-        # the root zone.
-        . 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
-                FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
-                bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
-                X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
-                W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
-                Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
-                QxA+Uk1ihz0=";
+       # This key (19036) is to be phased out starting in 2017. It will
+       # remain in the root zone for some time after its successor key
+       # has been added. It will remain this file until it is removed from
+       # the root zone.
+       . 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
+               FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
+               bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
+               X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
+               W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
+               Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
+               QxA+Uk1ihz0=";
 
-        # This key (20326) was published in the root zone in 2017.
-        # Servers which were already using the old key (19036) should
-        # roll seamlessly to this new one via RFC 5011 rollover. Servers
-        # being set up for the first time can use the contents of this
-        # file as initializing keys; thereafter, the keys in the
-        # managed key database will be trusted and maintained
-        # automatically.
-        . 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
-                +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
-                ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
-                0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
-                oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
-                RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
-                R1AkUTV74bU=";
+       # This key (20326) was published in the root zone in 2017.
+       # Servers which were already using the old key (19036) should
+       # roll seamlessly to this new one via RFC 5011 rollover. Servers
+       # being set up for the first time can use the contents of this
+       # file as initializing keys; thereafter, the keys in the
+       # managed key database will be trusted and maintained
+       # automatically.
+       . 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+               +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+               ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+               0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+               oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+               RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+               R1AkUTV74bU=";
 };

diff --git a/util/copyrights b/util/copyrights
index bfc1949433a6e02de1caa5518cefc4e1660e501c..f323b5659fe4019a9e68561eb069b12ac28cd41e 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -895,6 +895,7 @@
 ./bin/tests/system/checkconf/bad-update-policy8.conf   CONF-C  2018
 ./bin/tests/system/checkconf/bad-update-policy9.conf   CONF-C  2018
 ./bin/tests/system/checkconf/bad-view-also-notify.conf CONF-C  2016
+./bin/tests/system/checkconf/check-dlv-ksk-key.conf    CONF-C  2018
 ./bin/tests/system/checkconf/check-dup-records-fail.conf       CONF-C  2014,2016
 ./bin/tests/system/checkconf/check-dup-records.db      ZONE    2014,2016
 ./bin/tests/system/checkconf/check-mx-cname-fail.conf  CONF-C  2014,2016
@@ -903,6 +904,9 @@
 ./bin/tests/system/checkconf/check-mx.db       ZONE    2014,2016
 ./bin/tests/system/checkconf/check-names-fail.conf     CONF-C  2014,2016
 ./bin/tests/system/checkconf/check-names.db    ZONE    2014,2016
+./bin/tests/system/checkconf/check-root-ksk-2010.conf  CONF-C  2018
+./bin/tests/system/checkconf/check-root-ksk-2017.conf  CONF-C  2018
+./bin/tests/system/checkconf/check-root-ksk-both.conf  CONF-C  2018
 ./bin/tests/system/checkconf/check-srv-cname-fail.conf CONF-C  2014,2016
 ./bin/tests/system/checkconf/check-srv-cname.db        ZONE    2014,2016
 ./bin/tests/system/checkconf/clean.sh          SH      2011,2012,2013,2014,2016
@@ -4376,6 +4380,7 @@
 ./unit/atf-src/atf-c++/Atffile                 X       2011,2018
 ./unit/atf-src/atf-c++/Kyuafile                        X       2013,2018
 ./unit/atf-src/atf-c++/Makefile.am.inc         X       2011,2013,2018
+./unit/atf-src/atf-c++/atf-c++.3               X       2018
 ./unit/atf-src/atf-c++/atf-c++.m4              X       2013,2018
 ./unit/atf-src/atf-c++/atf-c++.pc.in           X       2011
 ./unit/atf-src/atf-c++/atf_c++_test.cpp                X       2011,2018
@@ -4427,6 +4432,7 @@
 ./unit/atf-src/atf-c/Atffile                   X       2011,2013,2018
 ./unit/atf-src/atf-c/Kyuafile                  X       2013,2018
 ./unit/atf-src/atf-c/Makefile.am.inc           X       2011,2013,2018
+./unit/atf-src/atf-c/atf-c.3                   X       2018
 ./unit/atf-src/atf-c/atf-c.m4                  X       2013,2018
 ./unit/atf-src/atf-c/atf-c.pc.in               X       2011
 ./unit/atf-src/atf-c/atf-common.m4             X       2013,2018
@@ -4500,6 +4506,7 @@
 ./unit/atf-src/atf-sh/atf-check.cpp            X       2011,2013,2018
 ./unit/atf-src/atf-sh/atf-check_test.sh                X       2011,2013,2018
 ./unit/atf-src/atf-sh/atf-sh.1                 X       2011,2018
+./unit/atf-src/atf-sh/atf-sh.3                 X       2018
 ./unit/atf-src/atf-sh/atf-sh.cpp               X       2011,2013,2018
 ./unit/atf-src/atf-sh/atf-sh.m4                        X       2013,2018
 ./unit/atf-src/atf-sh/atf-sh.pc.in             X       2013
@@ -4573,22 +4580,90 @@
 ./unit/atf-src/tools/application.cpp           X       2018
 ./unit/atf-src/tools/application.hpp           X       2018
 ./unit/atf-src/tools/application_test.cpp      X       2018
+./unit/atf-src/tools/atf-config.1              X       2018
+./unit/atf-src/tools/atf-config.cpp            X       2018
+./unit/atf-src/tools/atf-config_test.sh                X       2018
+./unit/atf-src/tools/atf-formats.5             X       2018
+./unit/atf-src/tools/atf-report.1              X       2018
+./unit/atf-src/tools/atf-report.cpp            X       2018
+./unit/atf-src/tools/atf-report_test.sh                X       2018
+./unit/atf-src/tools/atf-run.1                 X       2018
+./unit/atf-src/tools/atf-run.cpp               X       2018
+./unit/atf-src/tools/atf-run_test.sh           X       2018
+./unit/atf-src/tools/atf-version.1             X       2018
+./unit/atf-src/tools/atf-version.cpp           X       2018
 ./unit/atf-src/tools/atf.7.in                  X       2018
+./unit/atf-src/tools/atffile.cpp               X       2018
+./unit/atf-src/tools/atffile.hpp               X       2018
+./unit/atf-src/tools/atffile_test.cpp          X       2018
 ./unit/atf-src/tools/auto_array.hpp            X       2018
 ./unit/atf-src/tools/auto_array_test.cpp       X       2018
+./unit/atf-src/tools/bad_metadata_helper.c     X       2018
+./unit/atf-src/tools/config.cpp                        X       2018
+./unit/atf-src/tools/config.hpp                        X       2018
+./unit/atf-src/tools/config_file.cpp           X       2018
+./unit/atf-src/tools/config_file.hpp           X       2018
+./unit/atf-src/tools/config_file_test.cpp      X       2018
+./unit/atf-src/tools/config_test.cpp           X       2018
+./unit/atf-src/tools/defs.hpp.in               X       2018
 ./unit/atf-src/tools/env.cpp                   X       2018
 ./unit/atf-src/tools/env.hpp                   X       2018
+./unit/atf-src/tools/env_test.cpp              X       2018
+./unit/atf-src/tools/exceptions.cpp            X       2018
+./unit/atf-src/tools/exceptions.hpp            X       2018
+./unit/atf-src/tools/expand.cpp                        X       2018
+./unit/atf-src/tools/expand.hpp                        X       2018
+./unit/atf-src/tools/expand_test.cpp           X       2018
+./unit/atf-src/tools/expect_helpers.c          X       2018
+./unit/atf-src/tools/fail_helper.cpp           X       2018
 ./unit/atf-src/tools/fs.cpp                    X       2018
 ./unit/atf-src/tools/fs.hpp                    X       2018
 ./unit/atf-src/tools/fs_test.cpp               X       2018
+./unit/atf-src/tools/generate-revision.sh      X       2018
+./unit/atf-src/tools/io.cpp                    X       2018
+./unit/atf-src/tools/io.hpp                    X       2018
+./unit/atf-src/tools/io_test.cpp               X       2018
+./unit/atf-src/tools/misc_helpers.cpp          X       2018
+./unit/atf-src/tools/parser.cpp                        X       2018
+./unit/atf-src/tools/parser.hpp                        X       2018
+./unit/atf-src/tools/parser_test.cpp           X       2018
+./unit/atf-src/tools/pass_helper.cpp           X       2018
 ./unit/atf-src/tools/process.cpp               X       2018
 ./unit/atf-src/tools/process.hpp               X       2018
 ./unit/atf-src/tools/process_helpers.c         X       2018
 ./unit/atf-src/tools/process_test.cpp          X       2018
+./unit/atf-src/tools/reader.cpp                        X       2018
+./unit/atf-src/tools/reader.hpp                        X       2018
+./unit/atf-src/tools/reader_test.cpp           X       2018
+./unit/atf-src/tools/requirements.cpp          X       2018
+./unit/atf-src/tools/requirements.hpp          X       2018
+./unit/atf-src/tools/requirements_test.cpp     X       2018
+./unit/atf-src/tools/sample/atf-run.hooks      X       2018
+./unit/atf-src/tools/sample/common.conf                X       2018
+./unit/atf-src/tools/several_tcs_helper.c      X       2018
+./unit/atf-src/tools/share/atf-run.hooks       X       2018
+./unit/atf-src/tools/signals.cpp               X       2018
+./unit/atf-src/tools/signals.hpp               X       2018
+./unit/atf-src/tools/signals_test.cpp          X       2018
+./unit/atf-src/tools/test-program.cpp          X       2018
+./unit/atf-src/tools/test-program.hpp          X       2018
 ./unit/atf-src/tools/test_helpers.hpp          X       2018
+./unit/atf-src/tools/test_program_test.cpp     X       2018
+./unit/atf-src/tools/tests-results.css         X       2018
+./unit/atf-src/tools/tests-results.dtd         X       2018
+./unit/atf-src/tools/tests-results.xsl         X       2018
 ./unit/atf-src/tools/text.cpp                  X       2018
 ./unit/atf-src/tools/text.hpp                  X       2018
 ./unit/atf-src/tools/text_test.cpp             X       2018
+./unit/atf-src/tools/timers.cpp                        X       2018
+./unit/atf-src/tools/timers.hpp                        X       2018
+./unit/atf-src/tools/ui.cpp                    X       2018
+./unit/atf-src/tools/ui.hpp                    X       2018
+./unit/atf-src/tools/ui_test.cpp               X       2018
+./unit/atf-src/tools/user.cpp                  X       2018
+./unit/atf-src/tools/user.hpp                  X       2018
+./unit/atf-src/tools/user_test.cpp             X       2018
+./unit/atf-src/tools/zero_tcs_helper.c         X       2018
 ./unit/unittest.sh.in                          X       2011,2012,2015,2018
 ./util/COPYRIGHT                               X       1996,1997,1998,1999,2000,2001,2004,2007,2016
 ./util/COPYRIGHT.BRIEF                         X       1996,1997,1998,1999,2000,2001,2004,2016