[v9_12] copyrights

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7a5f6e41814a6d81b141b3e7f85c50980143b306..bdd24b2fe2f6b7400386160ebf186e989dc04544 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1,7 +1,7 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2000-2011, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000-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
@@ -48,6 +48,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/named/control.c b/bin/named/control.c
index 27e52957cd9d60009f2be7aa5c1e1c049f7b7d53..875fd74022eb44048f31cc64e3304757320df8f1 100644 (file)
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-2007, 2009-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 9daf108c5d74fcd125c97b55e08f37372959fb03..bda29fceaacd260e4bb82ad8893217a2099da0b8 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index 99d5500619f33b231553eb9ddfdfa286f67f3904..ea04f0b879885886f06af6786d851c2c00432983 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf b/bin/tests/system/rpzrecurse/ns1/named.conf
index f7f4887b92de4694c96fc7af8670e34ad1adaa61..d1b1319be33fd6e3eb9106219115c1b6675bdfef 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns1/named.conf
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,12 +20,12 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 zone "." {

diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index f5332044cbce91e048115ed202826a4520773003..795d357acd9ca9c9c644ec826ab910db83b2fe79 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index c63ad64f04bac095931ac31b550aa5b82cd06166..ffb7dadf8fcf03b7c384d13388c814f471b0e10b 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-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

diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index d1a019d36b03554b78adf4d301ebfdd9e26d6292..7be557e2d313d21505cf76ec7347d457f789e530 100644 (file)
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -86,22 +86,22 @@ usage(void) {
 #ifdef _WIN32
 static void
 InitSockets(void) {
-        WORD wVersionRequested;
-        WSADATA wsaData;
-        int err;
+       WORD wVersionRequested;
+       WSADATA wsaData;
+       int err;
 
-        wVersionRequested = MAKEWORD(2, 0);
+       wVersionRequested = MAKEWORD(2, 0);
 
-        err = WSAStartup(wVersionRequested, &wsaData);
-        if (err != 0) {
-                fprintf(stderr, "WSAStartup() failed: %d\n", err);
-                exit(1);
-        }
+       err = WSAStartup(wVersionRequested, &wsaData);
+       if (err != 0) {
+               fprintf(stderr, "WSAStartup() failed: %d\n", err);
+               exit(1);
+       }
 }
 
 static void
 DestroySockets(void) {
-        WSACleanup();
+       WSACleanup();
 }
 #else
 #define InitSockets() ((void)0)

diff --git a/util/copyrights b/util/copyrights
index 0ea548dc0ac815db7133ccbb073a3011482c734d..bd453f1bead7a0d18871f1e061fcfbf4b8e6c7f7 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -77,7 +77,7 @@
 ./bin/dig/Makefile.in                          MAKE    2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017
 ./bin/dig/dig.1                                        MAN     DOCBOOK
 ./bin/dig/dig.c                                        C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/dig/dig.docbook                          SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
+./bin/dig/dig.docbook                          SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.html                             HTML    DOCBOOK
 ./bin/dig/dighost.c                            C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/dig/host.1                               MAN     DOCBOOK
@@ -174,7 +174,7 @@
 ./bin/named/bind9.xsl.h                                X       2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/named/builtin.c                          C       2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/named/config.c                           C       2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/named/control.c                          C       2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/named/control.c                          C       2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/controlconf.c                      C       2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016,2017
 ./bin/named/convertxsl.pl                      PERL    2006,2007,2008,2012,2014,2016
 ./bin/named/fuzz.c                             C       2016,2017
@@ -1040,7 +1040,7 @@
 ./bin/tests/system/common/rndc.key             CONF-C  2011,2013,2016
 ./bin/tests/system/common/root.hint            ZONE    2000,2001,2004,2007,2016
 ./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/conf.sh.win32               SH      2016,2017
+./bin/tests/system/conf.sh.win32               SH      2016,2017,2018
 ./bin/tests/system/cookie/.gitignore           X       2014,2015
 ./bin/tests/system/cookie/bad-cookie-badhex.conf       CONF-C  2014,2015,2016
 ./bin/tests/system/cookie/bad-cookie-badsha1.conf      CONF-C  2017
@@ -2032,11 +2032,11 @@
 ./bin/tests/system/rpzrecurse/.gitignore       X       2015
 ./bin/tests/system/rpzrecurse/README           TXT.BRIEF       2015,2016
 ./bin/tests/system/rpzrecurse/ans5/ans.pl      PERL    2016
-./bin/tests/system/rpzrecurse/clean.sh         SH      2015,2016,2017
+./bin/tests/system/rpzrecurse/clean.sh         SH      2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns1/db.l0                ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/db.l1.l0     ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/example.db   ZONE    2015,2016
-./bin/tests/system/rpzrecurse/ns1/named.conf   CONF-C  2015,2016,2017
+./bin/tests/system/rpzrecurse/ns1/named.conf   CONF-C  2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns1/root.db      ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test1.example.net.db ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test2.example.net.db ZONE    2015,2016
@@ -2068,7 +2068,7 @@
 ./bin/tests/system/rpzrecurse/ns4/child.example.db     ZONE    2016
 ./bin/tests/system/rpzrecurse/ns4/named.conf   CONF-C  2016,2017
 ./bin/tests/system/rpzrecurse/prereq.sh                SH      2015,2016,2017
-./bin/tests/system/rpzrecurse/setup.sh         SH      2015,2016,2017
+./bin/tests/system/rpzrecurse/setup.sh         SH      2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/testgen.pl       PERL    2015,2016,2017
 ./bin/tests/system/rpzrecurse/tests.sh         SH      2015,2016,2017,2018
 ./bin/tests/system/rrchecker/classlist.good    X       2013
@@ -4153,7 +4153,7 @@
 ./lib/isc/win32/os.c                           C       2000,2001,2002,2004,2007,2013,2016
 ./lib/isc/win32/pk11_api.c                     C       2014,2016
 ./lib/isc/win32/resource.c                     C       2000,2001,2004,2007,2008,2016
-./lib/isc/win32/socket.c                       C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/isc/win32/socket.c                       C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/win32/stdio.c                                C       2000,2001,2004,2007,2013,2016
 ./lib/isc/win32/stdtime.c                      C       1999,2000,2001,2004,2007,2013,2016
 ./lib/isc/win32/strerror.c                     C       2001,2002,2004,2007,2016
@@ -4293,7 +4293,7 @@
 ./lib/samples/sample-async.c                   C       2009,2013,2014,2015,2016
 ./lib/samples/sample-gai.c                     C       2009,2012,2013,2014,2015,2016
 ./lib/samples/sample-request.c                 C       2009,2012,2013,2014,2015,2016
-./lib/samples/sample-update.c                  C       2009,2010,2012,2013,2014,2015,2016,2017
+./lib/samples/sample-update.c                  C       2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/win32/async.vcxproj.filters.in   X       2014,2015
 ./lib/samples/win32/async.vcxproj.in           X       2014,2015,2016,2017
 ./lib/samples/win32/async.vcxproj.user         X       2014
@@ -4376,6 +4376,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 +4428,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 +4502,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 +4576,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