[master] copyrights

diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index 76e654c64f6d9f9e76d9b743591d6fe720b774ef..8c3e33c71dc16cdedc8889996739e9ec5a10bd72 100644 (file)
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/mkeys/ns1/named1.conf b/bin/tests/system/mkeys/ns1/named1.conf
index 31afb8e1d2bc88d684b6b48ed194067e0ef08b1a..5f9eeaf91e0cae1dc047a3896723206a4ea86d4b 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named1.conf
+++ b/bin/tests/system/mkeys/ns1/named1.conf
@@ -1,5 +1,5 @@
 /*
- * 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/mkeys/ns1/named2.conf b/bin/tests/system/mkeys/ns1/named2.conf
index 19ef0cb70151993666350c089b25d2467e534c85..42f6712859b0301503cbdb0ebbe0ac3c46a97ad7 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named2.conf
+++ b/bin/tests/system/mkeys/ns1/named2.conf
@@ -1,5 +1,5 @@
 /*
- * 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/ns2/named-alt2.conf b/bin/tests/system/runtime/ns2/named-alt2.conf
index 0e0864a58b4ff1f112d0becc3bdcabe104f0000e..aaca67dd7e593e35b793baff22e45fb2a1590079 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt2.conf
+++ b/bin/tests/system/runtime/ns2/named-alt2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 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-alt3.conf b/bin/tests/system/runtime/ns2/named-alt3.conf
index 4353284f99f2f969b95985d9447c4ddde3440c0e..b5ad8473398401fd4da8ce6837794a78d6cec5e4 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt3.conf
+++ b/bin/tests/system/runtime/ns2/named-alt3.conf
@@ -1,5 +1,5 @@
 /*
- * 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/ns2/named-alt4.conf b/bin/tests/system/runtime/ns2/named-alt4.conf
index 12fd87fb9c7832c66985b75b27d28e2157a076f8..c1da2fed59c808a7c99a328f274c9c2b259762d6 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt4.conf
+++ b/bin/tests/system/runtime/ns2/named-alt4.conf
@@ -7,10 +7,10 @@
  */
 
 options {
-        directory "./nope";
-        port 5300;
-        pid-file "../named.pid";
-        listen-on { 127.0.0.1; };
-        listen-on-v6 { none; };
-        recursion no;
+       directory "./nope";
+       port 5300;
+       pid-file "../named.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 3b179425d0ca108f4b4c90a09b6863b72974d6b1..8b60f58e9ad4d5e888ed20f5db5b24be00c5c396 100644 (file)
--- a/bin/tests/system/runtime/ns2/named-alt5.conf
+++ b/bin/tests/system/runtime/ns2/named-alt5.conf
@@ -8,9 +8,9 @@
 
 options {
        managed-keys-directory "./nope";
-        port 5300;
-        pid-file "../named.pid";
-        listen-on { 127.0.0.1; };
-        listen-on-v6 { none; };
-        recursion no;
+       port 5300;
+       pid-file "../named.pid";
+       listen-on { 127.0.0.1; };
+       listen-on-v6 { none; };
+       recursion no;
 };

diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index baf9ad0a78e40d5c12997f3e3e598c4586be8f69..ff88c8c68019707fdcf703886e2ac9389b9fba82 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 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/lib/dns/keytable.c b/lib/dns/keytable.c
index 1421330c70175552f5c79633338f9e2159197ed5..9c5e53d86728afae8fac601decc2695a0a92d378 100644 (file)
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2013-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/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c
index 23ba29220736bc1260100cb8228beee2900d27cc..7f5c38508257e1ecab05374d8a8d8c3dd5e9b3f5 100644 (file)
--- a/lib/dns/tests/keytable_test.c
+++ b/lib/dns/tests/keytable_test.c
@@ -1,5 +1,5 @@
 /*
- * 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/lib/dns/zone.c b/lib/dns/zone.c
index 3ca053adbdbac3a9612891371484a1c19d3a44ee..80d9481fedff0a2fc99a41537976b406b28708fd 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9484,9 +9484,9 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                                                     keytag, namebuf,
                                                     initial
                                                      ? "initializing key "
-                                                       "verified"
+                                                       "verified"
                                                      : "acceptance timer "
-                                                       "complete");
+                                                       "complete");
                                }
                        } else if (keydata.addhd > now) {
                                /*

diff --git a/util/copyrights b/util/copyrights
index 655e411152f15aa1ffda0146e0a12af99841a913..216e003c7e257e0dad8703f7944eddf58ba08431 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1703,15 +1703,17 @@
 ./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,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
+./bin/tests/system/mkeys/clean.sh              SH      2015,2016,2017
+./bin/tests/system/mkeys/ns1/named1.conf       CONF-C  2015,2016,2017
+./bin/tests/system/mkeys/ns1/named2.conf       CONF-C  2015,2016,2017
 ./bin/tests/system/mkeys/ns1/root.db           ZONE    2015,2016
 ./bin/tests/system/mkeys/ns1/sign.sh           SH      2015,2016,2017
-./bin/tests/system/mkeys/ns2/named.args                X       2015,2016
+./bin/tests/system/mkeys/ns2/named.args                X       2015,2016,2017
 ./bin/tests/system/mkeys/ns2/named.conf                CONF-C  2015,2016
 ./bin/tests/system/mkeys/ns3/named.args                X       2015,2016
 ./bin/tests/system/mkeys/ns3/named.conf                CONF-C  2015,2016
+./bin/tests/system/mkeys/ns4/named.conf                CONF-C  2017
+./bin/tests/system/mkeys/ns5/named.conf                CONF-C  2017
 ./bin/tests/system/mkeys/prereq.sh             SH      2015,2016
 ./bin/tests/system/mkeys/setup.sh              SH      2015,2016,2017
 ./bin/tests/system/mkeys/tests.sh              SH      2015,2016,2017
@@ -2103,8 +2105,8 @@
 ./bin/tests/system/runtime/README              TXT.BRIEF       2014,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-alt2.conf CONF-C  2014,2016,2017
+./bin/tests/system/runtime/ns2/named-alt3.conf CONF-C  2015,2016,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/named1.conf     CONF-C  2017
@@ -3284,7 +3286,7 @@
 ./lib/dns/include/dns/journal.h                        C       1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013,2016,2017
 ./lib/dns/include/dns/keydata.h                        C       2009,2016
 ./lib/dns/include/dns/keyflags.h               C       1999,2000,2001,2004,2005,2006,2007,2016
-./lib/dns/include/dns/keytable.h               C       2000,2001,2004,2005,2007,2009,2010,2014,2015,2016
+./lib/dns/include/dns/keytable.h               C       2000,2001,2004,2005,2007,2009,2010,2014,2015,2016,2017
 ./lib/dns/include/dns/keyvalues.h              C       1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017
 ./lib/dns/include/dns/lib.h                    C       1999,2000,2001,2004,2005,2006,2007,2009,2016,2017
 ./lib/dns/include/dns/librpz.h                 C       2017
@@ -3352,7 +3354,7 @@
 ./lib/dns/journal.c                            C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
 ./lib/dns/key.c                                        C       2001,2004,2005,2006,2007,2011,2016
 ./lib/dns/keydata.c                            C       2009,2014,2016
-./lib/dns/keytable.c                           C       2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016
+./lib/dns/keytable.c                           C       2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016,2017
 ./lib/dns/lib.c                                        C       1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2017
 ./lib/dns/log.c                                        C       1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/lookup.c                             C       2000,2001,2003,2004,2005,2007,2013,2016
@@ -3589,7 +3591,7 @@
 ./lib/dns/tests/dstrandom_test.c               C       2017
 ./lib/dns/tests/geoip_test.c                   C       2013,2014,2015,2016,2017
 ./lib/dns/tests/gost_test.c                    C       2014,2015,2016,2017
-./lib/dns/tests/keytable_test.c                        C       2014,2015,2016
+./lib/dns/tests/keytable_test.c                        C       2014,2015,2016,2017
 ./lib/dns/tests/master_test.c                  C       2011,2012,2013,2015,2016,2017
 ./lib/dns/tests/mkraw.pl                       PERL    2011,2012,2016
 ./lib/dns/tests/name_test.c                    C       2014,2015,2016,2017