[master] copyrights

diff --git a/bin/tests/system/addzone/ns3/named2.conf b/bin/tests/system/addzone/ns3/named2.conf
index 8617c282eb6e4b4e7a5ab81218d880fdf9d576de..0b2684ec4c9516f46e9d8ac5d31460241110bf8c 100644 (file)
--- a/bin/tests/system/addzone/ns3/named2.conf
+++ b/bin/tests/system/addzone/ns3/named2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017  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/mkeys/README b/bin/tests/system/mkeys/README
index 5b42f38f016bad8356e55210de949be88916e5cd..2ffcfda24e69ff881a4731ef4cb34429c4334894 100644 (file)
--- a/bin/tests/system/mkeys/README
+++ b/bin/tests/system/mkeys/README
@@ -1,4 +1,4 @@
-Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2015-2017  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/runtime/clean.sh b/bin/tests/system/runtime/clean.sh
index 5f150c274b6347075e33e0837d7eddb0be23a06a..b3de9924c40e7a676d6a1404ac375297b223d29b 100644 (file)
--- a/bin/tests/system/runtime/clean.sh
+++ b/bin/tests/system/runtime/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2017  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/runtime/ns2/named-alt4.conf b/bin/tests/system/runtime/ns2/named-alt4.conf
index 2715508d69d3a1134790a75902cfd0bebedab34a..690b4282d27c90e54ba1191cf012fc9127fe58ce 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt4.conf
+++ b/bin/tests/system/runtime/ns2/named-alt4.conf
@@ -2,15 +2,15 @@
  * Copyright (C) 2017  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/.
+ * 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/.
  */
 
 options {
-        directory "./nope";
-        port 5300;
-        pid-file "../named4.pid";
-        listen-on { 127.0.0.1; };
-        listen-on-v6 { none; };
-        recursion no;
+       directory "./nope";
+       port 5300;
+       pid-file "../named4.pid";
+       listen-on { 127.0.0.1; };
+       listen-on-v6 { none; };
+       recursion no;
 };

diff --git a/bin/tests/system/runtime/ns2/named-alt5.conf b/bin/tests/system/runtime/ns2/named-alt5.conf
index 9cfc6ed6cfc7156781a2436db41f4cb07071a5bf..f6a4b68f4e7da557c618cf9674312f24a6253a14 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt5.conf
+++ b/bin/tests/system/runtime/ns2/named-alt5.conf
@@ -2,15 +2,15 @@
  * Copyright (C) 2017  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/.
+ * 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/.
  */
 
 options {
        managed-keys-directory "./nope";
-        port 5300;
-        pid-file "../named4.pid";
-        listen-on { 127.0.0.1; };
-        listen-on-v6 { none; };
-        recursion no;
+       port 5300;
+       pid-file "../named4.pid";
+       listen-on { 127.0.0.1; };
+       listen-on-v6 { none; };
+       recursion no;
 };

diff --git a/bin/tests/system/runtime/ns2/named1.conf b/bin/tests/system/runtime/ns2/named1.conf
index ea0e89fa94ea9e0662ccf136d2bacb7446a8c4c8..34dcfef4155386c8570865f876b5a563e3fa46b3 100644 (file)
--- a/bin/tests/system/runtime/ns2/named1.conf
+++ b/bin/tests/system/runtime/ns2/named1.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017  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/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index 33a70833b9b78fc8536c0ca833e1da9a055123b4..3725a182bfb06dec24e3f7f1830c9dc77c1fcfda 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) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  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/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index a1d586109f5405fccf7207ca6d9503da0fa03a3a..6a142fc633dd173e279568045e9550fd4c249b84 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2017  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/util/copyrights b/util/copyrights
index 0779984d7e11c42513aa598ad04180aaf1ce11fc..655e411152f15aa1ffda0146e0a12af99841a913 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -658,6 +658,7 @@
 ./bin/tests/system/addzone/ns2/redirect.db.1   ZONE    2016,2017
 ./bin/tests/system/addzone/ns2/redirect.db.2   ZONE    2016,2017
 ./bin/tests/system/addzone/ns3/named1.conf     CONF-C  2017
+./bin/tests/system/addzone/ns3/named2.conf     CONF-C  2017
 ./bin/tests/system/addzone/ns3/redirect.db.1   ZONE    2017
 ./bin/tests/system/addzone/ns3/redirect.db.2   ZONE    2017
 ./bin/tests/system/addzone/setup.sh            SH      2010,2012,2013,2014,2016,2017
@@ -1701,7 +1702,7 @@
 ./bin/tests/system/metadata/prereq.sh          SH      2009,2012,2014,2016
 ./bin/tests/system/metadata/setup.sh           SH      2009,2011,2012,2014,2016,2017
 ./bin/tests/system/metadata/tests.sh           SH      2009,2011,2012,2013,2014,2016,2017
-./bin/tests/system/mkeys/README                        TXT.BRIEF       2015,2016
+./bin/tests/system/mkeys/README                        TXT.BRIEF       2015,2016,2017
 ./bin/tests/system/mkeys/clean.sh              SH      2015,2016
 ./bin/tests/system/mkeys/ns1/named1.conf       CONF-C  2015,2016
 ./bin/tests/system/mkeys/ns1/named2.conf       CONF-C  2015,2016
@@ -2100,13 +2101,15 @@
 ./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,2016
 ./bin/tests/system/runtime/README              TXT.BRIEF       2014,2016
-./bin/tests/system/runtime/clean.sh            SH      2014,2015,2016
+./bin/tests/system/runtime/clean.sh            SH      2014,2015,2016,2017
 ./bin/tests/system/runtime/ns2/named-alt1.conf CONF-C  2014,2016
 ./bin/tests/system/runtime/ns2/named-alt2.conf CONF-C  2014,2016
 ./bin/tests/system/runtime/ns2/named-alt3.conf CONF-C  2015,2016
-./bin/tests/system/runtime/ns2/named.conf      CONF-C  2014,2016
-./bin/tests/system/runtime/setup.sh            SH      2015,2016
-./bin/tests/system/runtime/tests.sh            SH      2014,2015,2016
+./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/named1.conf     CONF-C  2017
+./bin/tests/system/runtime/setup.sh            SH      2015,2016,2017
+./bin/tests/system/runtime/tests.sh            SH      2014,2015,2016,2017
 ./bin/tests/system/send.pl                     PERL    2001,2004,2007,2011,2012,2016
 ./bin/tests/system/serve-stale/ans2/ans.pl     PERL    2017
 ./bin/tests/system/serve-stale/clean.sh                SH      2017
@@ -2698,6 +2701,7 @@
 ./contrib/dlz/modules/mysql/testing/dlz.data   X       2013,2017
 ./contrib/dlz/modules/mysql/testing/dlz.schema X       2013
 ./contrib/dlz/modules/mysql/testing/named.conf X       2013
+./contrib/dlz/modules/mysqldyn/.gitignore      X       2017
 ./contrib/dlz/modules/mysqldyn/Makefile.in     X       2014,2015,2017
 ./contrib/dlz/modules/mysqldyn/README          X       2014
 ./contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c      X       2014,2015
@@ -4142,6 +4146,7 @@
 ./lib/ns/Makefile.in                           MAKE    2017
 ./lib/ns/api                                   X       2017
 ./lib/ns/client.c                              C       2017
+./lib/ns/hooks.h                               C       2017
 ./lib/ns/include/Makefile.in                   MAKE    2017
 ./lib/ns/include/ns/Makefile.in                        MAKE    2017
 ./lib/ns/include/ns/client.h                   C       2017
@@ -4173,8 +4178,10 @@
 ./lib/ns/tests/notify_test.c                   C       2017
 ./lib/ns/tests/nstest.c                                C       2017
 ./lib/ns/tests/nstest.h                                C       2017
+./lib/ns/tests/query_test.c                    C       2017
 ./lib/ns/tests/testdata/notify/notify1.msg     X       2017
 ./lib/ns/tests/testdata/notify/zone1.db                ZONE    2017
+./lib/ns/tests/testdata/query/foo.db           ZONE    2017
 ./lib/ns/update.c                              C       2017
 ./lib/ns/version.c                             C       2017
 ./lib/ns/win32/DLLMain.c                       C       2017