final cleanup

- update Kyuafiles to match Atffiles
- copyrights
- CHANGES note

(cherry picked from commit 86e00cbb7161c50757bcacd59cf6fe3fc8a724ae)
(cherry picked from commit 80834b5b90ef63d0075859fd837677a69931ddbb)
(cherry picked from commit 442c1530a3032e3e910a403a4fa8b92dc3996bad)

diff --git a/CHANGES b/CHANGES
index bb72f66ba30375f51a83f6f976cca15169d76d09..98361f4a30819c92873532edef57929e4459a1d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4913.  [test]          Re-implemented older unit tests in bin/tests as ATF,
+                       removed the lib/tests unit testing library. [GL #115]
+
 4910.  [func]          Update util/check-changes to work on release branches.
                        [GL #113]
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c00f4fcfc2dd5e86945ee43888c84a0a1fec38ec..844833bad02b05ce31a08ff3b5dd23fa09cb88f4 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,17 @@
 <!--
- - Copyright (C) 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.
  -
- - See the COPYRIGHT file distributed with this work for additional
- - information regarding copyright ownership.
+ - 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.
 -->
 ## BIND Source Access and Contributor Guidelines
 *Feb 22, 2018*

diff --git a/acconfig.h b/acconfig.h
index 9d18b30498300c2949590c3d603415f72e583870..1350f7cd7d038bcb455372ee55fee84bc7d1e84b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2014, 2016, 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/bin/Makefile.in b/bin/Makefile.in
index 2959e476c81408d3543111216036bb05a5eb11d7..ee7d9623a5172c1f029148e1f96a128768067d57 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012-2014, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 585b649bf22b91e2556bb43c372ed6cf1b3866e5..5726e2cfa17cccc2cbc98248c89b6d57f7b56bba 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in
index 4442a808c49228b1e1624697591d326eabcef20b..d8ac74a1615eacb7aa058396d3d9cb88ab935a7e 100644 (file)
--- a/bin/tests/optional/Makefile.in
+++ b/bin/tests/optional/Makefile.in
@@ -1,11 +1,16 @@
-# Copyright (C) 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.
 #
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
+# 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.
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/optional/adb_test.c b/bin/tests/optional/adb_test.c
index 52108da4ff61804c18e03b51ecb9928817b370de..31771968384b3ea8a6dad07e8cfafed6c829d03b 100644 (file)
--- a/bin/tests/optional/adb_test.c
+++ b/bin/tests/optional/adb_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/backtrace_test.c b/bin/tests/optional/backtrace_test.c
index 67d399225e8a57969b7216a382844a97f2949674..20b92ea8f0ef1fe7a8c0f76bc9022e0cb5c1b791 100644 (file)
--- a/bin/tests/optional/backtrace_test.c
+++ b/bin/tests/optional/backtrace_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013, 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

diff --git a/bin/tests/optional/byaddr_test.c b/bin/tests/optional/byaddr_test.c
index d7e53b6d08b09b6140fb2509dd4c9679461716e1..5b3de1ce9a672325be25b34c6329a3d673ac318e 100644 (file)
--- a/bin/tests/optional/byaddr_test.c
+++ b/bin/tests/optional/byaddr_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  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

diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c
index 3c01b73b1d6826f00be1ba1c8c4c0ef300f2acb2..4530058cc352daf885bec0a88105f52346c5bebb 100644 (file)
--- a/bin/tests/optional/byname_test.c
+++ b/bin/tests/optional/byname_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2012, 2015, 2017  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

diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c
index e09ce0955bda7f1c170a0fa11a33be91b696d472..01fd7ff69aee0a92ed6ccfc7ca05ab1a42c2edbf 100644 (file)
--- a/bin/tests/optional/db_test.c
+++ b/bin/tests/optional/db_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/dst_test.c b/bin/tests/optional/dst_test.c
index 0f83a3fce191fd9cf0b4a0279190dab1a0baa51f..9364bf6bea78dcd248fd3d5ca8e1f09a2b3cda0b 100644 (file)
--- a/bin/tests/optional/dst_test.c
+++ b/bin/tests/optional/dst_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/entropy2_test.c b/bin/tests/optional/entropy2_test.c
index a479ac87ee6c4fd0462974aba5699ef0b804987e..3912675439ad18dce13e9d99c95814cbe0594f9a 100644 (file)
--- a/bin/tests/optional/entropy2_test.c
+++ b/bin/tests/optional/entropy2_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015, 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

diff --git a/bin/tests/optional/entropy_test.c b/bin/tests/optional/entropy_test.c
index 89bc7854691536b6d7892ead7c68e74c214d14da..9a731ab0d2623254870867e7f110ce51599a9f4f 100644 (file)
--- a/bin/tests/optional/entropy_test.c
+++ b/bin/tests/optional/entropy_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015, 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

diff --git a/bin/tests/optional/fsaccess_test.c b/bin/tests/optional/fsaccess_test.c
index 14959d2cd4a0d43a6d3bc61af6b9167c044d781e..97db6bf03c0d28e6257d5c08d78bd6724e4d85a0 100644 (file)
--- a/bin/tests/optional/fsaccess_test.c
+++ b/bin/tests/optional/fsaccess_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2012, 2015, 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

diff --git a/bin/tests/optional/gsstest.c b/bin/tests/optional/gsstest.c
index 492b3d2bd3ca95fd0a3593d0c052c98e6644a69a..f25a71b7523d254aaef0e84848c1c6eab38c8cbe 100644 (file)
--- a/bin/tests/optional/gsstest.c
+++ b/bin/tests/optional/gsstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2009-2011, 2013-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

diff --git a/bin/tests/optional/gxba_test.c b/bin/tests/optional/gxba_test.c
index f9d968def22ec38339aef71e7c794237fee0967a..19806c59646c0bf48a99cfc02d171273e6fc35f0 100644 (file)
--- a/bin/tests/optional/gxba_test.c
+++ b/bin/tests/optional/gxba_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  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

diff --git a/bin/tests/optional/gxbn_test.c b/bin/tests/optional/gxbn_test.c
index ed8198357fbe368b2f9d63328a74aa52bb77f114..498c82f9e345f218bbdf99c2c8e736fe25cc02cd 100644 (file)
--- a/bin/tests/optional/gxbn_test.c
+++ b/bin/tests/optional/gxbn_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  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

diff --git a/bin/tests/optional/hash_test.c b/bin/tests/optional/hash_test.c
index 6ae160b0b662c5ecd7fe87fc2cb7ff870914bb41..62de770e219af47a8bba7c5fd9522a9e7cf966f4 100644 (file)
--- a/bin/tests/optional/hash_test.c
+++ b/bin/tests/optional/hash_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2014-2017  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

diff --git a/bin/tests/optional/inter_test.c b/bin/tests/optional/inter_test.c
index c4aa81777112c13003ef1284321946a25f147391..4ca746c144e96d9875482d64c6a7a7a805974f2d 100644 (file)
--- a/bin/tests/optional/inter_test.c
+++ b/bin/tests/optional/inter_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001, 2003  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

diff --git a/bin/tests/optional/keyboard_test.c b/bin/tests/optional/keyboard_test.c
index 67c22c0c1d6ba95e1abc3b80d1c84535d2e94fef..b81e7523e1c77bc8e15d1942e5866389e2ea7a4b 100644 (file)
--- a/bin/tests/optional/keyboard_test.c
+++ b/bin/tests/optional/keyboard_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  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

diff --git a/bin/tests/optional/lex_test.c b/bin/tests/optional/lex_test.c
index 2adf62ee7ef5a2aeb7f94f1a3c03df815cc7214f..191ea2fc897d555f47d5e3356a4f487b808a7566 100644 (file)
--- a/bin/tests/optional/lex_test.c
+++ b/bin/tests/optional/lex_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/lfsr_test.c b/bin/tests/optional/lfsr_test.c
index 931af0d6a4037b7673e90f52be3933869869d99d..c0b5bca2e51890a035eb7b4d321c0ad3918563a4 100644 (file)
--- a/bin/tests/optional/lfsr_test.c
+++ b/bin/tests/optional/lfsr_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/log_test.c b/bin/tests/optional/log_test.c
index 84f61af118c581dfbe85c278a0416ce6ae183222..0875389b0c252b766617e4312ec32f299d9ab1f6 100644 (file)
--- a/bin/tests/optional/log_test.c
+++ b/bin/tests/optional/log_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/lwres_test.c b/bin/tests/optional/lwres_test.c
index fb60c46d90a02bed4bd55707f82007de9b3c8d8a..ea7525faf6e4f08a5b83e27a0c5bdbc053bdb23f 100644 (file)
--- a/bin/tests/optional/lwres_test.c
+++ b/bin/tests/optional/lwres_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  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

diff --git a/bin/tests/optional/lwresconf_test.c b/bin/tests/optional/lwresconf_test.c
index ebb30f9c1455931cbf1fedc28a456a663ab373c5..26694265cf2aebff508582ac3afd23bea4df8a28 100644 (file)
--- a/bin/tests/optional/lwresconf_test.c
+++ b/bin/tests/optional/lwresconf_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2015  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

diff --git a/bin/tests/optional/master_test.c b/bin/tests/optional/master_test.c
index e70304dc94ab4fdc4eb35f994cc3b030a83d5375..12ed7381fea688a64ad8166c2631f0eddc685987 100644 (file)
--- a/bin/tests/optional/master_test.c
+++ b/bin/tests/optional/master_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/mempool_test.c b/bin/tests/optional/mempool_test.c
index e77d75c57e4c45126656d24b0af43de81036918b..40e95156a5c37a020c18c73462f83ce3a6306596 100644 (file)
--- a/bin/tests/optional/mempool_test.c
+++ b/bin/tests/optional/mempool_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/name_test.c b/bin/tests/optional/name_test.c
index 2c88caf2c7b4be6931210c7ea253c1e600b23ae0..d1a9403c3f4d36ba9bdb49b719391019031bf78b 100644 (file)
--- a/bin/tests/optional/name_test.c
+++ b/bin/tests/optional/name_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-2001, 2003  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

diff --git a/bin/tests/optional/nsecify.c b/bin/tests/optional/nsecify.c
index 7c8f295e467cb6cb792d1fcbc63c9bf161244958..8898987ef25ec9d36303f4d40224de81dae90d50 100644 (file)
--- a/bin/tests/optional/nsecify.c
+++ b/bin/tests/optional/nsecify.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009, 2011, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001, 2003  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

diff --git a/bin/tests/optional/ratelimiter_test.c b/bin/tests/optional/ratelimiter_test.c
index 7e644a2309c54be1d1d66e2e80c755a7ea64f4cf..a8f44990c2d95c3a290e1c94c42d0fc898c471ec 100644 (file)
--- a/bin/tests/optional/ratelimiter_test.c
+++ b/bin/tests/optional/ratelimiter_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/rbt_test.c b/bin/tests/optional/rbt_test.c
index 71f33d5f858ba9a8b76edbf247f24fee31eac069..1e12cd80e0ce62b11538c3b4d064f8f327de97ae 100644 (file)
--- a/bin/tests/optional/rbt_test.c
+++ b/bin/tests/optional/rbt_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-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

diff --git a/bin/tests/optional/rbt_test.txt b/bin/tests/optional/rbt_test.txt
index c7230046fe27c36643faa9b2ca2df0ef9a0f02d7..c4bb71ce6be036aa7b8181e82e294dc22e87660d 100644 (file)
--- a/bin/tests/optional/rbt_test.txt
+++ b/bin/tests/optional/rbt_test.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2018  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/optional/rwlock_test.c b/bin/tests/optional/rwlock_test.c
index e5175e2ecd3fa6bd9782fee1613e2d046f5fdc0c..d1a0df836ff51cde4140037a76280e2feb74f707 100644 (file)
--- a/bin/tests/optional/rwlock_test.c
+++ b/bin/tests/optional/rwlock_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2013, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/serial_test.c b/bin/tests/optional/serial_test.c
index c75426828e2deeba78bf78b818c8615eaa12441e..e222701b8bb43d3154c2f4aef2f0cb2d98667bb0 100644 (file)
--- a/bin/tests/optional/serial_test.c
+++ b/bin/tests/optional/serial_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001, 2003  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

diff --git a/bin/tests/optional/shutdown_test.c b/bin/tests/optional/shutdown_test.c
index c373a53d8774e3d5901bfbeeee703c682365d552..33de8988bd04c4c28f19766ba16c781154234137 100644 (file)
--- a/bin/tests/optional/shutdown_test.c
+++ b/bin/tests/optional/shutdown_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2013, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/sig0_test.c b/bin/tests/optional/sig0_test.c
index 4018d5506307f7fff05e8e457f6b36a60c02b9fd..1572f9e753045929730595ab9db6cf670fc33928 100644 (file)
--- a/bin/tests/optional/sig0_test.c
+++ b/bin/tests/optional/sig0_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2012, 2015  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

diff --git a/bin/tests/optional/sock_test.c b/bin/tests/optional/sock_test.c
index 2df44b5f37260b183382bba915aa8aa9ead31527..56da52c4e99a800823f9aeef20994833b113a054 100644 (file)
--- a/bin/tests/optional/sock_test.c
+++ b/bin/tests/optional/sock_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008, 2012-2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/sym_test.c b/bin/tests/optional/sym_test.c
index b59c0ac58299e84741f14d09ed9d9c406c5021ac..71db668d0afe853abde497d929933e179c645b30 100644 (file)
--- a/bin/tests/optional/sym_test.c
+++ b/bin/tests/optional/sym_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/task_test.c b/bin/tests/optional/task_test.c
index d056ed17c7f094e6febdbe09fa5acd5a732e7ac9..421fef02c4e7fca342983d79e0d3648bd2ee3cca 100644 (file)
--- a/bin/tests/optional/task_test.c
+++ b/bin/tests/optional/task_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/timer_test.c b/bin/tests/optional/timer_test.c
index a1c6539dfa04f04056cf451e9df87b9d48cfc49e..bc705225f8f95f8ff30ca77c0529e8556307cb4f 100644 (file)
--- a/bin/tests/optional/timer_test.c
+++ b/bin/tests/optional/timer_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-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

diff --git a/bin/tests/optional/zone_test.c b/bin/tests/optional/zone_test.c
index 665a0f836400b7c65d77700fbe60d59195dc2b5e..496d0a2cc7d4766dc81e9d7b196089500cff3889 100644 (file)
--- a/bin/tests/optional/zone_test.c
+++ b/bin/tests/optional/zone_test.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2002  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

diff --git a/bin/tests/system/allow-query/clean.sh b/bin/tests/system/allow-query/clean.sh
index e45f3ce3dee32718f53636a2c4414167ae1bce9f..8bf5dab82ad0d39ada671c590bfe2df9238a993f 100644 (file)
--- a/bin/tests/system/allow-query/clean.sh
+++ b/bin/tests/system/allow-query/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2015, 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/generic.db b/bin/tests/system/allow-query/ns2/generic.db
index f5b1c5d492b3134abcd998a9e93666689a63984e..af29a341a280cfef8fbecc0c858920abdac10d18 100644 (file)
--- a/bin/tests/system/allow-query/ns2/generic.db
+++ b/bin/tests/system/allow-query/ns2/generic.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  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/named01.conf.in b/bin/tests/system/allow-query/ns2/named01.conf.in
index 3b4a6c9c627259a9f24fbc38ad7ab9f2a20ffaa2..b782d5a9eadd698718dd8e081b461b8a06a037a5 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named01.conf.in
+++ b/bin/tests/system/allow-query/ns2/named01.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/named02.conf.in b/bin/tests/system/allow-query/ns2/named02.conf.in
index 4278b9756bcacb96aab31c17ef355e223efb3901..04c277baa4940b89c0acde3eaee718e372ede99b 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/named03.conf.in b/bin/tests/system/allow-query/ns2/named03.conf.in
index 04c5220dc2051a6bdb89c903b74155a8a7250e23..797f32db4373987b2da9c3245a6889691821d37a 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named03.conf.in
+++ b/bin/tests/system/allow-query/ns2/named03.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 74441132d6906ae66be82bf78e775e106c209a4c..bccfd4ee3d5b7af313bf0df2e3d93f04362ce776 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/named05.conf.in b/bin/tests/system/allow-query/ns2/named05.conf.in
index afb96c170b5720b08ea83f3a2351f1496ddda9bb..84791983d8bbf2ee29ec2a7a87501d8e522af1aa 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named05.conf.in
+++ b/bin/tests/system/allow-query/ns2/named05.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 f6c59cb00a7eff3bacc837665d6e35d6778d610a..08198c9ba36ed7d8474214af6e6232e673706869 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/named07.conf.in b/bin/tests/system/allow-query/ns2/named07.conf.in
index 2e2d17d0c1e6f6fd24d458d7b17c2154f1105941..511b9396ac16a873770c6c83f7896f542e8f8f23 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named07.conf.in
+++ b/bin/tests/system/allow-query/ns2/named07.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 d014dcf2720519ab210e7b9c0775a87ea46d044c..f17a803e4b15adae36117c50ab79265a78ec9575 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/named09.conf.in b/bin/tests/system/allow-query/ns2/named09.conf.in
index 211e6f763033fb8e9c6107c53d3231d2847936a2..ecd17d80dbdc0ca03fe410c9faa5a5cb6698b3fa 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named09.conf.in
+++ b/bin/tests/system/allow-query/ns2/named09.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 af376b28eb30268c785520975ff719719d7cb206..b6efc3065c5987c4bd7928c4e529b8f858b9ec1f 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/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in
index 93f48023bc8e68a0f72927969dd6a5b918cbff30..151139a7e0766c94e37729615e4544764d2abedf 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named11.conf.in
+++ b/bin/tests/system/allow-query/ns2/named11.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 6ca6d465d00bf25a5233274e1f080c10248a0688..f67825e6580150b53ac23b424ab0a75bace72575 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/named21.conf.in b/bin/tests/system/allow-query/ns2/named21.conf.in
index 46c925dfcc71e7d51e88e81e49242b5111b93f7d..7da12f3fb3b5ba115f47d6c8c376d50cedfe5d91 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named21.conf.in
+++ b/bin/tests/system/allow-query/ns2/named21.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 16068721b41b26a2153cdc1eaeb2d24749d5a727..07eadb2ad4bbe2fb59a916ebd4c57194a2e6076d 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/named23.conf.in b/bin/tests/system/allow-query/ns2/named23.conf.in
index 66ef60b702732487f5e0e88901d519d898ad6a13..e8d21a5158026dce7da4d54b863c79b2b175be95 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named23.conf.in
+++ b/bin/tests/system/allow-query/ns2/named23.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 c8f72c78dbda52d292e1d0872193b4454a41c7ae..24370ab2894d5fee202de47dc81d19a39e5c6201 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/named25.conf.in b/bin/tests/system/allow-query/ns2/named25.conf.in
index 78ffae965ed4a7c5abfd6956b47f1a6e16eb891c..f540256cc71e6f8e10edf0acb070c2bdbf3e55ef 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named25.conf.in
+++ b/bin/tests/system/allow-query/ns2/named25.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 be0440fb59164dff4ab28806d976cbec744c8515..fa73126d648f912958143df814b6126e01b26d69 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/named27.conf.in b/bin/tests/system/allow-query/ns2/named27.conf.in
index 3183ac48c881437fb60b76b55827cfde51b1923d..a638c23c77a7695644239325a8f558a697d91978 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named27.conf.in
+++ b/bin/tests/system/allow-query/ns2/named27.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 7704a72b9a43638433d6300345544cdd8e1ef3e0..9a471c8f513788f5dc5fd5f5fdcc809c2b39d562 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/named29.conf.in b/bin/tests/system/allow-query/ns2/named29.conf.in
index e7932318f85501899fc9523e3ffcac6155b5d719..045186323fc8c8af776019d7d0165e76cf06ba45 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named29.conf.in
+++ b/bin/tests/system/allow-query/ns2/named29.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 eb771698a4e02fc23f19a65af301fb4e2c70c8d8..fd7a80cc9e6f8b174b109787d7fdf3b1ed6f3cc6 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/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in
index f915ae0b4942507bbc949455f7d194affe80acac..5fc5ffe6c19193a949f2a513ba1d3f70c9cf6b46 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named31.conf.in
+++ b/bin/tests/system/allow-query/ns2/named31.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 4b6ca4407959fd7530dcdcbe066a3c73942cb5b4..2e30467cf5aaa1cc4f60fb4de71d625e4b23506c 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/named33.conf.in b/bin/tests/system/allow-query/ns2/named33.conf.in
index f6111accbd052eaf6911ff61013ed77c92d4174b..e205797a0ac0e56aed6de51db3cefff526cf4671 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named33.conf.in
+++ b/bin/tests/system/allow-query/ns2/named33.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 d970e015c7e6c5a277f308c64c4f502ceedcff22..2b5517cee490429f6703bc2f57da88dbd54c024a 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/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in
index 6194b91ce3ffad7b6dd1124e39a24cacf162fe37..2444a8c41b3db956abc9a7af927670412a3a60c8 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named40.conf.in
+++ b/bin/tests/system/allow-query/ns2/named40.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 c71c0958a2f7ae28f779c503cb35acd5bd6385c6..7b06810c9f24aed364315f8c9656a12504d48bf0 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/named54.conf.in b/bin/tests/system/allow-query/ns2/named54.conf.in
index 55478326392c6736e113e6565d43da088be00bbf..5873eb8b2b14eba21305d9bf6f4dd617410827af 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named54.conf.in
+++ b/bin/tests/system/allow-query/ns2/named54.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 e4c006ec3112a70a072cc68ffdf1940a05d74e34..85d8938e08515d954877b1363befcf98df9a7e95 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/named56.conf.in b/bin/tests/system/allow-query/ns2/named56.conf.in
index b18d903e2025fe9cdbb434d1eb31f04a4649dd7b..7f6b8e44f465b33e04f9aa48baa2cd44ced8e1ac 100644 (file)
--- a/bin/tests/system/allow-query/ns2/named56.conf.in
+++ b/bin/tests/system/allow-query/ns2/named56.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 4614e318230393c463737ed5b2b99620688ed60c..0a82244f72d8ad9829a04aad018e5f390a50265b 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/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
index 6d1ddefdbfa520d41d60a48e1cb339a2e0c10826..28fc0009e30cc7922befb426f3cfda33e9af2062 100644 (file)
--- a/bin/tests/system/allow-query/setup.sh
+++ b/bin/tests/system/allow-query/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 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/tests.sh b/bin/tests/system/allow-query/tests.sh
index 1643e9b9a6c8b145ff83ad436c4fcf32b6ffc0af..0b99a72a9801bd56578faf1ee150ccb274906af8 100644 (file)
--- a/bin/tests/system/allow-query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2016, 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/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index b2471de90fa3b68ef2b1421933fadebd3d7626d5..3d40e0997368693873c464471764364091472f43 100644 (file)
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009-2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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/bin/tests/system/checkconf/bad-in-view-dup.conf b/bin/tests/system/checkconf/bad-in-view-dup.conf
index dfde12401cb08309d7f600fb36f732e09fd1412f..051a546e7b733d8b24a1be013c31cb5700ac1e66 100644 (file)
--- a/bin/tests/system/checkconf/bad-in-view-dup.conf
+++ b/bin/tests/system/checkconf/bad-in-view-dup.conf
@@ -1,12 +1,17 @@
 /*
- * Copyright (C) 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.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * 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.
  */
 
 view a {

diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index d59a43c44f08aa4621a1507e8f544ec0419aa929..219f3e8b489f17cf801838ffd358f7e9bd05bd8e 100644 (file)
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/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/dlzredir/prereq.sh.in b/bin/tests/system/dlzredir/prereq.sh.in
index 4d47204c99b4f0b63cbe69208712e192460d3c16..6fbc9407aeec5e5cf11f5b3c060eb1b62c3cbfbe 100644 (file)
--- a/bin/tests/system/dlzredir/prereq.sh.in
+++ b/bin/tests/system/dlzredir/prereq.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/dlzredir/tests.sh b/bin/tests/system/dlzredir/tests.sh
index 4b405460518fc3c5afaf04da19f0564f8d27ffc7..0252ceaadc1d760967a989f146b8c1f7988a7786 100644 (file)
--- a/bin/tests/system/dlzredir/tests.sh
+++ b/bin/tests/system/dlzredir/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/dnssec/signer/general/test1.zone b/bin/tests/system/dnssec/signer/general/test1.zone
index a53fba763b3877c174103743e0b36969baefcdbd..a8b5d83af833e9606b0bcd2b4968e38179f50c43 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test1.zone
+++ b/bin/tests/system/dnssec/signer/general/test1.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has two DNSKEY records, both of which have
 ; existing private key files available.  They should be loaded automatically
 ; and the zone correctly signed.

diff --git a/bin/tests/system/dnssec/signer/general/test2.zone b/bin/tests/system/dnssec/signer/general/test2.zone
index 731c291cc741720fb6e0737428afc3944edc11f7..311e036bbc662a2b0bf65a0a3df279ba5b2fdf7b 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test2.zone
+++ b/bin/tests/system/dnssec/signer/general/test2.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has one non-KSK DNSKEY record for which the
 ; private key file exists.  It should be loaded automatically and the zone
 ; correctly signed.

diff --git a/bin/tests/system/dnssec/signer/general/test3.zone b/bin/tests/system/dnssec/signer/general/test3.zone
index ec05bee7c5bd362f4a28750940193315b1568218..ee0cfb173d58f34835128c7e9d3b45c16e90552c 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test3.zone
+++ b/bin/tests/system/dnssec/signer/general/test3.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;       This is a zone which has one KSK DNSKEY record for which the
 ; private key file exists.  It should be loaded automatically.  As there
 ; is no non-KSK DNSKEY the resulting zone should be rejected.

diff --git a/bin/tests/system/dnssec/signer/general/test4.zone b/bin/tests/system/dnssec/signer/general/test4.zone
index 824e52b513b683cc20addb460b847287096bd6f1..552198e2364fff5b02dae2fd03de532e05fa34c1 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test4.zone
+++ b/bin/tests/system/dnssec/signer/general/test4.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has three DNSKEY records, two (KSK + ZSK) of
 ; which have existing private key files available.  The third is a
 ; pre-published ZSK.

diff --git a/bin/tests/system/dnssec/signer/general/test5.zone b/bin/tests/system/dnssec/signer/general/test5.zone
index 546ebad457c982f89a4bf09250ec473998235f5c..9e9cb69c7dbfeb745e111658917c6d46441a6c05 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test5.zone
+++ b/bin/tests/system/dnssec/signer/general/test5.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has three DNSKEY records, two (KSK +ZSK) of which
 ; have existing private key files available.  The third is a KSK.
 ;

diff --git a/bin/tests/system/dnssec/signer/general/test6.zone b/bin/tests/system/dnssec/signer/general/test6.zone
index 91091f7275f2dceaa4381bfb2cddd25846c1f260..23fc30f9b5a0ce08f6f142a219d11eb4144b7b48 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test6.zone
+++ b/bin/tests/system/dnssec/signer/general/test6.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has four DNSKEY records, two (KK + ZSK) of which
 ; have existing private key files available.  There are also a KSK and ZSK
 ; for which there will be no signatures.

diff --git a/bin/tests/system/dnssec/signer/general/test7.zone b/bin/tests/system/dnssec/signer/general/test7.zone
index e42d5aa1def61747787f6a06d8f41322d3a8cb50..1ccc3d967866e144f2302789dd59238cfdc5cdfb 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test7.zone
+++ b/bin/tests/system/dnssec/signer/general/test7.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has two DNSKEY records, none of which have
 ; existing private key files available.  The resulting zone should fail
 ; the consistancy tests.

diff --git a/bin/tests/system/dnssec/signer/general/test8.zone b/bin/tests/system/dnssec/signer/general/test8.zone
index cc51f0a183049d84df7932136d0901ae13118c93..32a9dc4b910058419e6dfd6b9f60f950a38cc475 100644 (file)
--- a/bin/tests/system/dnssec/signer/general/test8.zone
+++ b/bin/tests/system/dnssec/signer/general/test8.zone
@@ -1,4 +1,17 @@
+; 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
+; 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.
+
 ;      This is a zone which has two DNSKEY records, one of which,
 ; the KSK, has a private key.  The resulting zone should be rejected as
 ; it has no ZSK signatures.

diff --git a/bin/tests/system/fetchlimit/prereq.sh b/bin/tests/system/fetchlimit/prereq.sh
index d7d78ce6b8397603f83a15902de575ac15d9de21..f277ee8bd4cad8f5b2e9eb0a669c055a5b001313 100644 (file)
--- a/bin/tests/system/fetchlimit/prereq.sh
+++ b/bin/tests/system/fetchlimit/prereq.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/prereq.sh b/bin/tests/system/filter-aaaa/prereq.sh
index 212ee50528aaca3057b4d8bc4cb4a480c258e17e..efb7c66d280d28ae6398598cd9453b22a3bb480b 100644 (file)
--- a/bin/tests/system/filter-aaaa/prereq.sh
+++ b/bin/tests/system/filter-aaaa/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/stopall.sh b/bin/tests/system/stopall.sh
index d9b57e0f92e3c7d4e98a9bf67285ab63188a147d..ed46aadb4c7c5d69c2b9cd2413cde158e943c11e 100644 (file)
--- a/bin/tests/system/stopall.sh
+++ b/bin/tests/system/stopall.sh
@@ -1,13 +1,18 @@
 #!/bin/sh
 #
-# Copyright (C) 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.
 #
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
+# 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.
 
 #
 # Stop all hanging processes from any system tests.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 99b21b6bae6302ddea38a76728985bd0f66ac7d2..457cf289a975cc975b8722a50f45adaf2cc353b6 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -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")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 3fd6108184176da21c7db6d40d931ce5610aa616..97c8d354c5678d5f1740ebc0abcef19a75d437b1 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile
index 444273a34ff3255991699eacac5069d6ed8cba96..5b9f3177e4c4486d5c4f5f830268a349ce0c3766 100644 (file)
--- a/lib/dns/tests/Kyuafile
+++ b/lib/dns/tests/Kyuafile
@@ -8,6 +8,7 @@ atf_test_program{name='dbiterator_test'}
 atf_test_program{name='dbversion_test'}
 atf_test_program{name='dh_test'}
 atf_test_program{name='dispatch_test'}
+atf_test_program{name='dst_test'}
 atf_test_program{name='geoip_test'}
 atf_test_program{name='gost_test'}
 atf_test_program{name='master_test'}
@@ -20,6 +21,7 @@ atf_test_program{name='rbt_test'}
 atf_test_program{name='rdata_test'}
 atf_test_program{name='rdataset_test'}
 atf_test_program{name='rdatasetstats_test'}
+atf_test_program{name='resolver_test'}
 atf_test_program{name='rsa_test'}
 atf_test_program{name='time_test'}
 atf_test_program{name='tsig_test'}

diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index e330ec0555d6d54f55c7cc14b3a4a9a4de785c44..c70ececd08edf4b7d2b76dca64cff9e8be36f7ee 100644 (file)
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -1,5 +1,5 @@
 /*
- * 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/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index ebd30f4354b941dead7f304e9b346a02f7f3a869..e753eb0e6239d5df5c2384eaa152e1417c442e15 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -1,5 +1,5 @@
 /*
- * 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/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index 95717c917921756d452b14faa214b95401cf512e..1ab9fa8eca0c54141ec5cc902c8444d54ca1fee0 100644 (file)
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -1,5 +1,5 @@
 /*
- * 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/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c
index 284249b65fede7d15c57267a13f7ca14ea0f51b2..d75acb5c4cb28af67c432769fba84f6baf4a5d5c 100644 (file)
--- a/lib/dns/tests/dst_test.c
+++ b/lib/dns/tests/dst_test.c
@@ -1,12 +1,17 @@
 /*
- * Copyright (C) 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.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * 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.
  */
 
 /* ! \file */

diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c
index 9f6987fece6b8f8532509c3f87e60bbacec4e9ba..a1a4ad1a13897ddf19e858eadab04ba493b467fe 100644 (file)
--- a/lib/dns/tests/rbt_test.c
+++ b/lib/dns/tests/rbt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  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/lib/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c
index 1bb34f24a1ad9a90a063d8db7f6639f2d3c43fd5..67fbe05627359233966094db7bf746eb7820b687 100644 (file)
--- a/lib/dns/tests/resolver_test.c
+++ b/lib/dns/tests/resolver_test.c
@@ -1,12 +1,17 @@
 /*
- * Copyright (C) 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.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * 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.
  */
 
 /*! \file */

diff --git a/lib/dns/tests/testdata/db/data.db b/lib/dns/tests/testdata/db/data.db
index ab61c9584c52364a0f30976a7612d3258e17b975..dcffb093dfbf25ced9d76f0d2caae7bbb836018b 100644 (file)
--- a/lib/dns/tests/testdata/db/data.db
+++ b/lib/dns/tests/testdata/db/data.db
@@ -1,3 +1,17 @@
+; 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
+; 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 1000
 @              in      soa     localhost. postmaster.localhost. (
                                1993050801      ;serial

diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c
index 9252e69b617273218aff80bba2d76a37d1c2a186..d8d938249cf707939095d0ac9e81a14024cf02e9 100644 (file)
--- a/lib/irs/resconf.c
+++ b/lib/irs/resconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 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
@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file resconf.c */
 
 /**

diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c
index 4b81692b8fdeaf993577f3bb2e0d396833aabe8a..8f76d0cf61d6388ee7fdaedf9d211488f8f54a99 100644 (file)
--- a/lib/irs/tests/resconf_test.c
+++ b/lib/irs/tests/resconf_test.c
@@ -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/lib/irs/tests/testdata/options-bad-ndots.conf b/lib/irs/tests/testdata/options-bad-ndots.conf
index 5c104c74b55d9e32db32cb386ad067ddc06b0cbf..a4e7e92c726613e2d7e676b7fd22d5fc3e54dddb 100644 (file)
--- a/lib/irs/tests/testdata/options-bad-ndots.conf
+++ b/lib/irs/tests/testdata/options-bad-ndots.conf
@@ -1,11 +1,16 @@
-# Copyright (C) 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.
 #
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
+# 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.
 
 search example.com example.net
 options ndots:256

diff --git a/lib/irs/tests/testdata/options-empty.conf b/lib/irs/tests/testdata/options-empty.conf
index e8b902ea2d832b764654cc72afc54e3531891eab..da758e2f901d219f2fe10b6e6418c1a0026bf571 100644 (file)
--- a/lib/irs/tests/testdata/options-empty.conf
+++ b/lib/irs/tests/testdata/options-empty.conf
@@ -1,11 +1,16 @@
-# Copyright (C) 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.
 #
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
+# 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.
 
 domain example.com
 options

diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c
index dbdf9c9b99cab3ae2e002daa16afa3458045043b..cbd3e7477d4ed2aca55e33febe618141634cbb97 100644 (file)
--- a/lib/isc/netscope.c
+++ b/lib/isc/netscope.c
@@ -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) 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 77433f7e236047dcdb8be42808f6ea107f8afee8..ac20445558e17bd41ded3dded75f877c627e1f20 100644 (file)
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -2,6 +2,7 @@ syntax(2)
 test_suite('bind9')
 
 atf_test_program{name='aes_test'}
+atf_test_program{name='atomic_test'}
 atf_test_program{name='counter_test'}
 atf_test_program{name='errno_test'}
 atf_test_program{name='hash_test'}
@@ -23,3 +24,4 @@ atf_test_program{name='symtab_test'}
 atf_test_program{name='task_test'}
 atf_test_program{name='taskpool_test'}
 atf_test_program{name='time_test'}
+atf_test_program{name='timer_test'}

diff --git a/lib/isc/tests/atomic_test.c b/lib/isc/tests/atomic_test.c
index 1280c61fc692b6d277f075a8ef8a88537857543e..c4d1029d2d7302619cbf496e94346ac6469064d6 100644 (file)
--- a/lib/isc/tests/atomic_test.c
+++ b/lib/isc/tests/atomic_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2015, 2016  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/lib/isc/tests/counter_test.c b/lib/isc/tests/counter_test.c
index 872111b91bd88a2f442efbd5fd8bcb5ef088d7d0..b0f25bdfe5d97158ec6b11b8fe287470d5f34d37 100644 (file)
--- a/lib/isc/tests/counter_test.c
+++ b/lib/isc/tests/counter_test.c
@@ -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/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c
index fb8f4410ab7c39c4b4b8695f6e4567ec4ab5dd9f..6cf8db4003ca17507426f3a7af4673c2b6b63eff 100644 (file)
--- a/lib/isc/tests/isctest.c
+++ b/lib/isc/tests/isctest.c
@@ -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/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h
index 614d1b82b67136e012976d7c18705a3e65856393..6ccc0d1bb8fb9166028487570d9ef4f9026c8687 100644 (file)
--- a/lib/isc/tests/isctest.h
+++ b/lib/isc/tests/isctest.h
@@ -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

diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c
index 79b792241550a67d17a1a4e3f2433c84e8fb2c9f..810bc80a0586e7f249c3cb328761f010c5a23f2d 100644 (file)
--- a/lib/isc/tests/mem_test.c
+++ b/lib/isc/tests/mem_test.c
@@ -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/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index 670bf45eaab9cdb4c1d8e7499712fd73a83f5a21..07029eca4ba00b4afd1902cf3b4f3b54d7f6d781 100644 (file)
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -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/lib/isc/tests/parse_test.c b/lib/isc/tests/parse_test.c
index a2fb6c7fada1a34b22a5050c96e722f29efb0cd4..7270b18bde597eb2eb7734c1bb6d52939420f636 100644 (file)
--- a/lib/isc/tests/parse_test.c
+++ b/lib/isc/tests/parse_test.c
@@ -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/lib/isc/tests/pool_test.c b/lib/isc/tests/pool_test.c
index 28b2dd132f2fe7e44a568b4b449bd29b63f1a9bc..a3db0c595ced5dcf7e6c664b81cf90982a922529 100644 (file)
--- a/lib/isc/tests/pool_test.c
+++ b/lib/isc/tests/pool_test.c
@@ -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/lib/isc/tests/queue_test.c b/lib/isc/tests/queue_test.c
index dce834c448832553954377331f0c6c1d2f5b30a7..44afa982eccf830b129768b0cdea8d64b0dbc05b 100644 (file)
--- a/lib/isc/tests/queue_test.c
+++ b/lib/isc/tests/queue_test.c
@@ -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

diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c
index eb3800bd104a180ef48ade388df93bddd0dddb15..055037777e9002cd9330ba43f7e470fc384ad195 100644 (file)
--- a/lib/isc/tests/radix_test.c
+++ b/lib/isc/tests/radix_test.c
@@ -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/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c
index afd4320097dd1a01abf9e9fe1e93d22894bcc327..f60ebfee02613ff876e959739c72a06fcd56fa6b 100644 (file)
--- a/lib/isc/tests/sockaddr_test.c
+++ b/lib/isc/tests/sockaddr_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2015, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 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/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c
index 3c24034ed97acfc209525907b6b0d52c369fe375..bdad840e6145fe5bbd2a6a8fd3bdfe86183e7712 100644 (file)
--- a/lib/isc/tests/socket_test.c
+++ b/lib/isc/tests/socket_test.c
@@ -1,5 +1,5 @@
 /*
- * 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/lib/isc/tests/symtab_test.c b/lib/isc/tests/symtab_test.c
index 6a1955309fdadcfd91507de6878c583a5c9afa56..203ae7d6f2ff5ff5114c4bfeef4326a033715ac7 100644 (file)
--- a/lib/isc/tests/symtab_test.c
+++ b/lib/isc/tests/symtab_test.c
@@ -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/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c
index 813c9eb06a81dd0f7a5e19f8e5441e1486b44c95..96e9e5ba1031630db3f44f9c3e91c74ee0c2775d 100644 (file)
--- a/lib/isc/tests/task_test.c
+++ b/lib/isc/tests/task_test.c
@@ -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

diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c
index 1cd479f563c30bf4cef178c100b2879f471ac4c8..a5bcdd6ae520833787ebfe04efbc53512da215ea 100644 (file)
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -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

diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c
index e360419b58fc8facf70f70be2086eb8558c4c36e..a33a4b469c375b56443f3a2a093883807ac820ae 100644 (file)
--- a/lib/isc/tests/timer_test.c
+++ b/lib/isc/tests/timer_test.c
@@ -1,12 +1,17 @@
 /*
- * Copyright (C) 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.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * 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.
  */
 
 /*! \file */

diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 63e5c1a163ea14d3e625bfa7bb1ec814a7bba246..c00cccd8a2fce2e394c9e8a298b0da3316222542 100644 (file)
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2017, 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/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index f6aeeb3465431be006c0ae002dccba576a98a736..1f9ca23388dfebbcdae0504082601cc79b6b5e04 100644 (file)
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013-2015, 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/util/check-changes b/util/check-changes
index 9763f2f5c8d490e3f286a86de2a1c3a241b90a51..2d5042b07132d68067e58aeefc80a3484d59e4de 100644 (file)
--- a/util/check-changes
+++ b/util/check-changes
@@ -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) 2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/util/copyrights b/util/copyrights
index 07e4f6587948436639246a6a125365f683251f90..a94697a855fefcaea3f433649183178d011d1ee8 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2,6 +2,8 @@
 ./.gitignore                                   X       2012,2013,2014,2015
 ./Atffile                                      X       2011
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./CONTRIBUTING                                 X       2018
+./CONTRIBUTING.md                              MKD     2018
 ./COPYRIGHT                                    TXT     1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./EXCLUDED                                     X       2017
 ./FAQ.xml                                      SGML    2017
@@ -13,9 +15,9 @@
 ./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
 ./README.md                                    MKD     2017,2018
-./acconfig.h                                   C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016
+./acconfig.h                                   C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016,2018
 ./aclocal.m4                                   X       1999,2000,2001,2012,2014
-./bin/Makefile.in                              MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2013,2014
+./bin/Makefile.in                              MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2013,2014,2018
 ./bin/check/.gitignore                         X       2012
 ./bin/check/Makefile.in                                MAKE    2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2014,2015,2016
 ./bin/check/check-tool.c                       C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2017
@@ -419,44 +421,58 @@
 ./bin/rndc/win32/rndcutil.vcxproj.filters.in   X       2013,2015
 ./bin/rndc/win32/rndcutil.vcxproj.in           X       2013,2015,2016,2017
 ./bin/rndc/win32/rndcutil.vcxproj.user         X       2013
-./bin/tests/.gitignore                         X       2012,2013
-./bin/tests/Kchild.example.+003+04017.key      X       2000,2001
-./bin/tests/Kchild.example.+003+04017.private  X       2000,2001
-./bin/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/adb_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015
-./bin/tests/backtrace_test.c                   C       2009,2013,2015
+./bin/tests/.gitignore                         X       2012,2013,2018
+./bin/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/bigtest/README                     TXT.BRIEF       2013
 ./bin/tests/bigtest/buildzones.sh              SH      2013
 ./bin/tests/bigtest/rndc.key                   X       2013
 ./bin/tests/bigtest/tests.sh                   SH      2013
 ./bin/tests/bigtest/zones                      X       2013
-./bin/tests/byaddr_test.c                      C       2000,2001,2002,2004,2005,2007,2012,2015
-./bin/tests/byname_test.c                      C       2000,2001,2004,2005,2007,2009,2012,2015,2017
 ./bin/tests/cfg_test.c                         C       2001,2002,2004,2005,2007,2009,2010,2011,2015
-./bin/tests/compress_test.c                    C       1999,2000,2001,2004,2005,2006,2007,2015
-./bin/tests/db_test.c                          C       1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2015,2017
-./bin/tests/entropy2_test.c                    C       2000,2001,2004,2005,2007,2015,2018
-./bin/tests/entropy_test.c                     C       2000,2001,2004,2005,2007,2015,2018
 ./bin/tests/fromhex.pl                         PERL    2015
-./bin/tests/fsaccess_test.c                    C       2000,2001,2004,2005,2007,2012,2015,2018
-./bin/tests/gxba_test.c                                C       2000,2001,2004,2005,2007,2015
-./bin/tests/gxbn_test.c                                C       2000,2001,2004,2005,2007,2015
-./bin/tests/hash_test.c                                C       2000,2001,2004,2005,2006,2007,2014,2015,2016,2017
-./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012
-./bin/tests/inter_test.c                       C       2000,2001,2003,2004,2005,2007,2008,2015,2018
-./bin/tests/keyboard_test.c                    C       2000,2001,2004,2005,2007,2015
-./bin/tests/lex_test.c                         C       1998,1999,2000,2001,2004,2005,2007,2015
-./bin/tests/lfsr_test.c                                C       1999,2000,2001,2004,2005,2007,2015
-./bin/tests/log_test.c                         C       1999,2000,2001,2004,2007,2011,2014,2015
-./bin/tests/lwres_test.c                       C       2000,2001,2004,2005,2007,2015
-./bin/tests/lwresconf_test.c                   C       2000,2001,2004,2007,2015
 ./bin/tests/makejournal.c                      C       2013,2015,2017
-./bin/tests/master_test.c                      C       1999,2000,2001,2004,2007,2009,2015
 ./bin/tests/mdig.c                             C       2016,2017,2018
-./bin/tests/mempool_test.c                     C       1999,2000,2001,2004,2007
-./bin/tests/name_test.c                                C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2015,2018
 ./bin/tests/named.conf                         CONF-C  1999,2000,2001,2004,2007,2011
-./bin/tests/nsecify.c                          C       1999,2000,2001,2003,2004,2007,2008,2009,2011,2015,2017
+./bin/tests/optional/Kchild.example.+003+04017.key     X       2018
+./bin/tests/optional/Kchild.example.+003+04017.private X       2018
+./bin/tests/optional/Makefile.in               MAKE    2018
+./bin/tests/optional/adb_test.c                        C       2018
+./bin/tests/optional/backtrace_test.c          C       2018
+./bin/tests/optional/byaddr_test.c             C       2018
+./bin/tests/optional/byname_test.c             C       2018
+./bin/tests/optional/db_test.c                 C       2018
+./bin/tests/optional/dst_test.c                        C       2018
+./bin/tests/optional/entropy2_test.c           C       2018
+./bin/tests/optional/entropy_test.c            C       2018
+./bin/tests/optional/fsaccess_test.c           C       2018
+./bin/tests/optional/gsstest.c                 C       2018
+./bin/tests/optional/gxba_test.c               C       2018
+./bin/tests/optional/gxbn_test.c               C       2018
+./bin/tests/optional/hash_test.c               C       2018
+./bin/tests/optional/inter_test.c              C       2018
+./bin/tests/optional/keyboard_test.c           C       2018
+./bin/tests/optional/lex_test.c                        C       2018
+./bin/tests/optional/lfsr_test.c               C       2018
+./bin/tests/optional/log_test.c                        C       2018
+./bin/tests/optional/lwres_test.c              C       2018
+./bin/tests/optional/lwresconf_test.c          C       2018
+./bin/tests/optional/master_test.c             C       2018
+./bin/tests/optional/mempool_test.c            C       2018
+./bin/tests/optional/name_test.c               C       2018
+./bin/tests/optional/nsecify.c                 C       2018
+./bin/tests/optional/ratelimiter_test.c                C       2018
+./bin/tests/optional/rbt_test.c                        C       2018
+./bin/tests/optional/rbt_test.out              X       1999,2000,2001,2018
+./bin/tests/optional/rbt_test.txt              SH      1999,2000,2001,2004,2007,2012,2018
+./bin/tests/optional/rwlock_test.c             C       2018
+./bin/tests/optional/serial_test.c             C       2018
+./bin/tests/optional/shutdown_test.c           C       2018
+./bin/tests/optional/sig0_test.c               C       2018
+./bin/tests/optional/sock_test.c               C       2018
+./bin/tests/optional/sym_test.c                        C       2018
+./bin/tests/optional/task_test.c               C       2018
+./bin/tests/optional/timer_test.c              C       2018
+./bin/tests/optional/zone_test.c               C       2018
 ./bin/tests/pkcs11/.gitignore                  X       2014
 ./bin/tests/pkcs11/Makefile.in                 MAKE    2014
 ./bin/tests/pkcs11/README                      X       2014,2016
@@ -474,22 +490,12 @@
 ./bin/tests/pkcs11/benchmarks/verify.c         C       2014,2015,2016
 ./bin/tests/pkcs11/pkcs11-hmacmd5.c            C       2014,2015
 ./bin/tests/pkcs11/pkcs11-md5sum.c             C       2014,2015
-./bin/tests/ratelimiter_test.c                 C       1999,2000,2001,2004,2007,2015
-./bin/tests/rbt_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2018
-./bin/tests/rbt_test.out                       X       1999,2000,2001
-./bin/tests/rbt_test.txt                       SH      1999,2000,2001,2004,2007,2012
-./bin/tests/rwlock_test.c                      C       1998,1999,2000,2001,2004,2005,2007,2013,2017,2018
-./bin/tests/serial_test.c                      C       1999,2000,2001,2003,2004,2007,2015
-./bin/tests/shutdown_test.c                    C       1998,1999,2000,2001,2004,2007,2011,2013,2017,2018
-./bin/tests/sig0_test.c                                C       2000,2001,2004,2005,2007,2008,2009,2012,2015
-./bin/tests/sock_test.c                                C       1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2017,2018
 ./bin/tests/startperf/README                   X       2011
 ./bin/tests/startperf/clean.sh                 SH      2011,2012
 ./bin/tests/startperf/makenames.pl             PERL    2011,2012
 ./bin/tests/startperf/mkzonefile.pl            PERL    2011,2012
 ./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,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
@@ -535,55 +541,43 @@
 ./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
-./bin/tests/system/allow_query/ns2/added.db    ZONE    2010
-./bin/tests/system/allow_query/ns2/addrallow.db        ZONE    2010
-./bin/tests/system/allow_query/ns2/addrdisallow.db     ZONE    2010
-./bin/tests/system/allow_query/ns2/addrnotallow.db     ZONE    2010
-./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.in     CONF-C  2010,2018
-./bin/tests/system/allow_query/ns2/named02.conf.in     CONF-C  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2010,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  2013,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,2018
-./bin/tests/system/allow_query/tests.sh                SH      2010,2012,2013,2016,2018
+./bin/tests/system/allow-query/.gitignore      X       2018
+./bin/tests/system/allow-query/clean.sh                SH      2018
+./bin/tests/system/allow-query/ns2/generic.db  ZONE    2018
+./bin/tests/system/allow-query/ns2/named01.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named02.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named03.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named04.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named05.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named06.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named07.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named08.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named09.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named10.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named11.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named12.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named21.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named22.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named23.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named24.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named25.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named26.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named27.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named28.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named29.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named30.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named31.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named32.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named33.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named34.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named40.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named53.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named54.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named55.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named56.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/ns2/named57.conf.in     CONF-C  2018
+./bin/tests/system/allow-query/setup.sh                SH      2018
+./bin/tests/system/allow-query/tests.sh                SH      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,2016
@@ -611,7 +605,7 @@
 ./bin/tests/system/autosign/ns3/inaczsk2.example.db.in ZONE    2017
 ./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,2016,2017
+./bin/tests/system/autosign/ns3/keygen.sh      SH      2009,2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/autosign/ns3/named.conf.in  CONF-C  2009,2010,2011,2012,2013,2017,2018
 ./bin/tests/system/autosign/ns3/nozsk.example.db.in    ZONE    2011
 ./bin/tests/system/autosign/ns3/nsec.example.db.in     ZONE    2010
@@ -680,6 +674,7 @@
 ./bin/tests/system/checkconf/bad-also-notify.conf      CONF-C  2012,2013
 ./bin/tests/system/checkconf/bad-dnssec.conf   CONF-C  2012,2013
 ./bin/tests/system/checkconf/bad-hint.conf     CONF-C  2014
+./bin/tests/system/checkconf/bad-in-view-dup.conf      CONF-C  2018
 ./bin/tests/system/checkconf/bad-inline-slave.conf     CONF-C  2013
 ./bin/tests/system/checkconf/bad-many.conf     CONF-C  2005,2012
 ./bin/tests/system/checkconf/bad-master-request-ixfr.conf      CONF-C  2014
@@ -907,7 +902,7 @@
 ./bin/tests/system/dialup/ns3/hint.db          ZONE    2000,2001,2004,2007
 ./bin/tests/system/dialup/ns3/named.conf       CONF-C  2000,2001,2004,2007
 ./bin/tests/system/dialup/setup.sh             SH      2000,2001,2004,2007,2012
-./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016
+./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016,2018
 ./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,2018
@@ -975,8 +970,8 @@
 ./bin/tests/system/dlzredir/ns1/dns-root/dns.d/-/A=10=100.100.100.2=   X       2012
 ./bin/tests/system/dlzredir/ns1/dns-root/dns.d/@/NS=10=root.=  X       2012
 ./bin/tests/system/dlzredir/ns1/dns-root/dns.d/@/SOA=10=ns.root.=root.root.=2012051500=0=0=0=10=       X       2012
-./bin/tests/system/dlzredir/prereq.sh.in       SH      2012
-./bin/tests/system/dlzredir/tests.sh           SH      2012
+./bin/tests/system/dlzredir/prereq.sh.in       SH      2012,2018
+./bin/tests/system/dlzredir/tests.sh           SH      2012,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
@@ -1094,6 +1089,20 @@
 ./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/general/Kexample.com.+005+07065.key   X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+07065.private       X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+23362.key   X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+23362.private       X       2018
+./bin/tests/system/dnssec/signer/general/bogus-ksk.key X       2018
+./bin/tests/system/dnssec/signer/general/bogus-zsk.key X       2018
+./bin/tests/system/dnssec/signer/general/test1.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test2.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test3.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test4.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test5.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test6.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test7.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test8.zone    ZONE    2018
 ./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,2018
@@ -1177,7 +1186,7 @@
 ./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/prereq.sh                SH      2015,2016,2018
 ./bin/tests/system/fetchlimit/setup.sh         SH      2015,2018
 ./bin/tests/system/fetchlimit/tests.sh         SH      2015,2016,2018
 ./bin/tests/system/filter-aaaa/.gitignore      X       2012,2014,2016
@@ -1216,7 +1225,7 @@
 ./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,2017
-./bin/tests/system/filter-aaaa/prereq.sh       SH      2010,2012,2014,2016
+./bin/tests/system/filter-aaaa/prereq.sh       SH      2010,2012,2014,2016,2018
 ./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/clean.sh            SH      2013,2015,2018
@@ -1861,6 +1870,7 @@
 ./bin/tests/system/statschannel/tests.sh       SH      2015,2016,2018
 ./bin/tests/system/stop.pl                     SH      2001,2004,2005,2006,2007,2012,2016,2018
 ./bin/tests/system/stop.sh                     SH      2000,2001,2004,2007,2012
+./bin/tests/system/stopall.sh                  SH      2018
 ./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
 ./bin/tests/system/stress/ns2/named.conf       CONF-C  2000,2001,2004,2007
@@ -2091,9 +2101,10 @@
 ./bin/tests/system/zonechecks/prereq.sh                SH      2014
 ./bin/tests/system/zonechecks/setup.sh         SH      2012,2013,2014,2015,2016,2018
 ./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2013,2014,2015,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/timer_test.c                       C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2018
+./bin/tests/testdata/wire/wire_test.data       X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data2      X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data3      X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data4      X       1999,2000,2001,2018
 ./bin/tests/virtual-time/Makefile.in           MAKE    2010,2012
 ./bin/tests/virtual-time/README                        TXT.BRIEF       2010
 ./bin/tests/virtual-time/autosign-ksk/clean.sh SH      2010,2012
@@ -2182,11 +2193,6 @@
 ./bin/tests/win32/timer_test.vcxproj.in                X       2013,2015,2016,2017
 ./bin/tests/win32/timer_test.vcxproj.user      X       2013
 ./bin/tests/wire_test.c                                C       1999,2000,2001,2004,2005,2007,2015
-./bin/tests/wire_test.data                     X       1999,2000,2001
-./bin/tests/wire_test.data2                    X       1999,2000,2001
-./bin/tests/wire_test.data3                    X       1999,2000,2001
-./bin/tests/wire_test.data4                    X       1999,2000,2001
-./bin/tests/zone_test.c                                C       1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015
 ./bin/tools/.gitignore                         X       2012,2014
 ./bin/tools/Makefile.in                                MAKE    2009,2010,2012,2013,2014,2015,2016,2017
 ./bin/tools/arpaname.1                         MAN     DOCBOOK
@@ -2266,7 +2272,7 @@
 ./bin/win32/BINDInstall/DirBrowse.h            C.PORTION       2001,2004,2007
 ./bin/win32/BINDInstall/StdAfx.cpp             X       2001
 ./bin/win32/BINDInstall/StdAfx.h               X       2001,2006,2011,2013
-./bin/win32/BINDInstall/VersionInfo.cpp                X       2001,2008,2015,2017
+./bin/win32/BINDInstall/VersionInfo.cpp                X       2001,2008,2015,2017,2018
 ./bin/win32/BINDInstall/VersionInfo.h          X       2001
 ./bin/win32/BINDInstall/res/BINDInstall.ico    X       2001
 ./bin/win32/BINDInstall/res/BINDInstall.rc2    X       2001
@@ -2743,7 +2749,6 @@
 ./doc/dev/HOW-ADB-WORKS.txt                    TXT.BRIEF       2003,2004
 ./doc/dev/autoconf                             TXT.BRIEF       2001,2002,2004
 ./doc/dev/coding.html                          HTML    1999,2000,2001,2002,2004,2007
-./doc/dev/contrib.md                           MKD     2017
 ./doc/dev/cvs-usage                            TXT.BRIEF       2000,2001,2004
 ./doc/dev/dev.md                               MKD     2017
 ./doc/dev/magic_numbers                                TXT.BRIEF       1999,2000,2001,2002,2004
@@ -2811,7 +2816,7 @@
 ./lib/.gitignore                               X       2012
 ./lib/Atffile                                  X       2011,2014,2016
 ./lib/Kyuafile                                 X       2017
-./lib/Makefile.in                              MAKE    1998,1999,2000,2001,2003,2004,2007,2012,2013,2014
+./lib/Makefile.in                              MAKE    1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2018
 ./lib/bind9/Makefile.in                                MAKE    2001,2004,2007,2009,2012,2014,2015,2016,2017
 ./lib/bind9/api                                        X       2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/bind9/check.c                            C       2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -3161,7 +3166,7 @@
 ./lib/dns/rdata/in_1/px_26.h                   C       1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/in_1/srv_33.c                  C       1999,2000,2001,2003,2004,2005,2007,2009,2015
 ./lib/dns/rdata/in_1/srv_33.h                  C       1999,2000,2001,2004,2005,2007
-./lib/dns/rdata/in_1/wks_11.c                  C       1999,2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rdata/in_1/wks_11.c                  C       1999,2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rdata/in_1/wks_11.h                  C       1999,2000,2001,2004,2007
 ./lib/dns/rdata/rdatastructpre.h               C       1999,2000,2001,2004,2007
 ./lib/dns/rdata/rdatastructsuf.h               C       1999,2000,2001,2004,2007
@@ -3189,20 +3194,20 @@
 ./lib/dns/ssu_external.c                       C       2011,2012,2013,2017
 ./lib/dns/stats.c                              C       2000,2001,2004,2005,2007,2008,2009,2012
 ./lib/dns/tcpmsg.c                             C       1999,2000,2001,2004,2005,2006,2007,2015,2018
-./lib/dns/tests/Atffile                                X       2011,2017
+./lib/dns/tests/Atffile                                X       2011,2017,2018
 ./lib/dns/tests/Kdh.+002+18602.key             X       2014
 ./lib/dns/tests/Krsa.+005+29235.key            X       2016
-./lib/dns/tests/Kyuafile                       X       2017
+./lib/dns/tests/Kyuafile                       X       2017,2018
 ./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/db_test.c                      C       2013,2015,2018
 ./lib/dns/tests/dbdiff_test.c                  C       2011,2012,2017
 ./lib/dns/tests/dbiterator_test.c              C       2011,2012,2016
 ./lib/dns/tests/dbversion_test.c               C       2011,2012,2014,2015
 ./lib/dns/tests/dh_test.c                      C       2014,2016
 ./lib/dns/tests/dispatch_test.c                        C       2012,2014
-./lib/dns/tests/dnstest.c                      C       2011,2012,2013,2014,2015,2017
-./lib/dns/tests/dnstest.h                      C       2011,2012,2015,2017
+./lib/dns/tests/dnstest.c                      C       2011,2012,2013,2014,2015,2017,2018
+./lib/dns/tests/dnstest.h                      C       2011,2012,2015,2017,2018
 ./lib/dns/tests/dst_test.c                     C       2018
 ./lib/dns/tests/geoip_test.c                   C       2013,2014,2015,2017
 ./lib/dns/tests/gost_test.c                    C       2014,2015,2017
@@ -3213,16 +3218,28 @@
 ./lib/dns/tests/peer_test.c                    C       2014
 ./lib/dns/tests/private_test.c                 C       2011,2012
 ./lib/dns/tests/rbt_serialize_test.c           C       2014,2015
-./lib/dns/tests/rbt_test.c                     C       2012,2013,2014,2015,2016,2017
+./lib/dns/tests/rbt_test.c                     C       2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/rdata_test.c                   C       2012,2013,2015,2016,2017
 ./lib/dns/tests/rdataset_test.c                        C       2012
 ./lib/dns/tests/rdatasetstats_test.c           C       2012,2015,2018
+./lib/dns/tests/resolver_test.c                        C       2018
 ./lib/dns/tests/rsa_test.c                     C       2016
+./lib/dns/tests/testdata/db/data.db            ZONE    2018
 ./lib/dns/tests/testdata/dbiterator/zone1.data ZONE    2011,2012
 ./lib/dns/tests/testdata/dbiterator/zone2.data X       2011
 ./lib/dns/tests/testdata/diff/zone1.data       ZONE    2011,2012
 ./lib/dns/tests/testdata/diff/zone2.data       ZONE    2011,2012
 ./lib/dns/tests/testdata/diff/zone3.data       ZONE    2011,2012
+./lib/dns/tests/testdata/dst/Ktest.+001+00002.key      X       2018
+./lib/dns/tests/testdata/dst/Ktest.+001+54622.key      X       2018
+./lib/dns/tests/testdata/dst/Ktest.+001+54622.private  X       2018
+./lib/dns/tests/testdata/dst/Ktest.+003+23616.key      X       2018
+./lib/dns/tests/testdata/dst/Ktest.+003+23616.private  X       2018
+./lib/dns/tests/testdata/dst/Ktest.+003+49667.key      X       2018
+./lib/dns/tests/testdata/dst/test1.data                X       2018
+./lib/dns/tests/testdata/dst/test1.dsasig      X       2018
+./lib/dns/tests/testdata/dst/test1.rsasig      X       2018
+./lib/dns/tests/testdata/dst/test2.data                X       2018
 ./lib/dns/tests/testdata/master/.gitignore     X       2012
 ./lib/dns/tests/testdata/master/master1.data   X       2011
 ./lib/dns/tests/testdata/master/master10.data  X       2011
@@ -3299,15 +3316,17 @@
 ./lib/irs/include/irs/resconf.h                        C       2009,2014
 ./lib/irs/include/irs/types.h                  C       2009
 ./lib/irs/include/irs/version.h                        C       2009
-./lib/irs/resconf.c                            C       2009,2011,2012,2014,2015,2016
+./lib/irs/resconf.c                            C       2009,2011,2012,2014,2015,2016,2018
 ./lib/irs/tests/Atffile                                X       2016,2017
 ./lib/irs/tests/Kyuafile                       X       2017
 ./lib/irs/tests/Makefile.in                    MAKE    2016,2017,2018
-./lib/irs/tests/resconf_test.c                 C       2016
+./lib/irs/tests/resconf_test.c                 C       2016,2018
 ./lib/irs/tests/testdata/domain.conf           CONF-SH 2016
 ./lib/irs/tests/testdata/nameserver-v4.conf    CONF-SH 2016
 ./lib/irs/tests/testdata/nameserver-v6.conf    CONF-SH 2016
+./lib/irs/tests/testdata/options-bad-ndots.conf        CONF-SH 2018
 ./lib/irs/tests/testdata/options-debug.conf    CONF-SH 2016
+./lib/irs/tests/testdata/options-empty.conf    CONF-SH 2018
 ./lib/irs/tests/testdata/options-ndots.conf    CONF-SH 2016
 ./lib/irs/tests/testdata/options-timeout.conf  CONF-SH 2016
 ./lib/irs/tests/testdata/options-unknown.conf  CONF-SH 2016
@@ -3484,7 +3503,7 @@
 ./lib/isc/mips/include/isc/atomic.h            C       2005,2007,2016
 ./lib/isc/mutexblock.c                         C       1999,2000,2001,2004,2005,2007,2011,2012
 ./lib/isc/netaddr.c                            C       1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016,2017
-./lib/isc/netscope.c                           C       2002,2004,2005,2006,2007
+./lib/isc/netscope.c                           C       2002,2004,2005,2006,2007,2018
 ./lib/isc/nls/Makefile.in                      MAKE    1999,2000,2001,2004,2007,2009,2012
 ./lib/isc/nls/msgcat.c                         C       1999,2000,2001,2004,2005,2007
 ./lib/isc/noatomic/Makefile.in                 MAKE    2007,2012
@@ -3548,40 +3567,42 @@
 ./lib/isc/task.c                               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2017,2018
 ./lib/isc/task_p.h                             C       2000,2001,2004,2005,2007,2009,2011,2012,2013
 ./lib/isc/taskpool.c                           C       1999,2000,2001,2004,2005,2007,2011,2012,2013
-./lib/isc/tests/Atffile                                X       2011,2017
+./lib/isc/tests/Atffile                                X       2011,2017,2018
 ./lib/isc/tests/Kyuafile                       X       2017
 ./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/tests/aes_test.c                     C       2014
-./lib/isc/tests/counter_test.c                 C       2014
+./lib/isc/tests/atomic_test.c                  C       2018
+./lib/isc/tests/counter_test.c                 C       2014,2018
 ./lib/isc/tests/errno_test.c                   C       2016
 ./lib/isc/tests/hash_test.c                    C       2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/tests/heap_test.c                    C       2017
 ./lib/isc/tests/inet_ntop_test.c               C       2017
-./lib/isc/tests/isctest.c                      C       2011,2012,2013,2014,2017
-./lib/isc/tests/isctest.h                      C       2011,2012
+./lib/isc/tests/isctest.c                      C       2011,2012,2013,2014,2017,2018
+./lib/isc/tests/isctest.h                      C       2011,2012,2018
 ./lib/isc/tests/lex_test.c                     C       2013
-./lib/isc/tests/mem_test.c                     C       2015
-./lib/isc/tests/netaddr_test.c                 C       2016
-./lib/isc/tests/parse_test.c                   C       2012,2013
-./lib/isc/tests/pool_test.c                    C       2013
+./lib/isc/tests/mem_test.c                     C       2015,2018
+./lib/isc/tests/netaddr_test.c                 C       2016,2018
+./lib/isc/tests/parse_test.c                   C       2012,2013,2018
+./lib/isc/tests/pool_test.c                    C       2013,2018
 ./lib/isc/tests/print_test.c                   C       2014,2015,2016
-./lib/isc/tests/queue_test.c                   C       2011,2012
-./lib/isc/tests/radix_test.c                   C       2014
+./lib/isc/tests/queue_test.c                   C       2011,2012,2018
+./lib/isc/tests/radix_test.c                   C       2014,2018
 ./lib/isc/tests/regex_test.c                   C       2013,2015
 ./lib/isc/tests/safe_test.c                    C       2013,2015,2017
-./lib/isc/tests/sockaddr_test.c                        C       2012,2015,2017
-./lib/isc/tests/socket_test.c                  C       2011,2012,2013,2014,2015,2017
-./lib/isc/tests/symtab_test.c                  C       2011,2012,2013
-./lib/isc/tests/task_test.c                    C       2011,2012
-./lib/isc/tests/taskpool_test.c                        C       2011,2012
+./lib/isc/tests/sockaddr_test.c                        C       2012,2015,2017,2018
+./lib/isc/tests/socket_test.c                  C       2011,2012,2013,2014,2015,2017,2018
+./lib/isc/tests/symtab_test.c                  C       2011,2012,2013,2018
+./lib/isc/tests/task_test.c                    C       2011,2012,2018
+./lib/isc/tests/taskpool_test.c                        C       2011,2012,2018
 ./lib/isc/tests/time_test.c                    C       2014,2015
+./lib/isc/tests/timer_test.c                   C       2018
 ./lib/isc/timer.c                              C       1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2017
 ./lib/isc/timer_p.h                            C       2000,2001,2004,2005,2007,2009
 ./lib/isc/tm.c                                 C       2014
 ./lib/isc/unix/Makefile.in                     MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2014,2016,2017
 ./lib/isc/unix/app.c                           C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2017
 ./lib/isc/unix/dir.c                           C       1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2017
-./lib/isc/unix/entropy.c                       C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2012,2017
+./lib/isc/unix/entropy.c                       C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2012,2017,2018
 ./lib/isc/unix/errno.c                         C       2016
 ./lib/isc/unix/errno2result.c                  C       2000,2001,2002,2004,2005,2007,2011,2012,2013,2016
 ./lib/isc/unix/errno2result.h                  C       2000,2001,2004,2005,2007,2011,2012,2016
@@ -3688,7 +3709,7 @@
 ./lib/isc/win32/time.c                         C       1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012,2013,2014,2017,2018
 ./lib/isc/win32/unistd.h                       C       2000,2001,2004,2007,2008,2009
 ./lib/isc/win32/version.c                      C       1998,1999,2000,2001,2004,2007
-./lib/isc/win32/win32os.c                      C       2002,2004,2007,2013,2014,2015
+./lib/isc/win32/win32os.c                      C       2002,2004,2007,2013,2014,2015,2018
 ./lib/isc/x86_32/Makefile.in                   MAKE    2007,2012
 ./lib/isc/x86_32/include/Makefile.in           MAKE    2007,2012
 ./lib/isc/x86_32/include/isc/Makefile.in       MAKE    2007,2012,2015,2016
@@ -4280,7 +4301,7 @@
 ./util/bindkeys.pl                             PERL    2009,2010,2011,2012,2014,2017
 ./util/branchsync.sh                           SH      2013
 ./util/check-categories.sh                     SH      2015,2017
-./util/check-changes                           PERL    2002,2004,2007,2012
+./util/check-changes                           PERL    2002,2004,2007,2012,2018
 ./util/check-includes.pl                       PERL    2000,2001,2004,2007,2012
 ./util/check-instincludes.sh                   SH      2000,2001,2004,2007,2012
 ./util/check-pullups.pl                                PERL    2001,2002,2003,2004,2007,2012
@@ -4289,6 +4310,7 @@
 ./util/commit-arm.sh                           SH      2012
 ./util/copyrights                              X       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./util/file_year.sh                            SH      2012
+./util/git-replay-merge.sh                     SH      2018
 ./util/kit.sh                                  SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016
 ./util/mandoc2docbook.pl                       PERL    2001,2004,2007,2012
 ./util/mdnbuildtest.sh                         SH      2000,2001,2004,2007,2012
@@ -4308,8 +4330,8 @@
 ./version                                      X       1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./win32utils/Configure                         PERL    2013,2014,2015,2016,2017,2018
 ./win32utils/GeoIP.diff                                X       2013
-./win32utils/bind9.sln.in                      X       2013,2014,2016,2017
-./win32utils/build.txt                         TXT.BRIEF       2013,2014,2015,2016
+./win32utils/bind9.sln.in                      X       2013,2014,2016,2017,2018
+./win32utils/build.txt                         TXT.BRIEF       2013,2014,2015,2016,2018
 ./win32utils/index.html                                HTML    2006,2007,2008,2012,2013,2014,2015
 ./win32utils/legacy/BINDBuild.dsw.in           X       2001,2005,2006,2008,2009,2010,2013,2014,2016
 ./win32utils/legacy/BuildAll.bat.in            BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2014,2016
@@ -4317,4 +4339,4 @@
 ./win32utils/legacy/BuildSetup.bat.in          BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016
 ./win32utils/legacy/makedefs.pl                        PERL    2001,2004,2007,2009,2012,2013,2014
 ./win32utils/legacy/win32-build.txt            TXT.BRIEF       2001,2002,2004,2005,2008,2009,2012,2013,2014
-./win32utils/readme1st.txt                     TXT.BRIEF       2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2016
+./win32utils/readme1st.txt                     TXT.BRIEF       2001,2003,2004,2005,2007,2008,2009,2012,2013,2014,2016,2018

diff --git a/util/git-replay-merge.sh b/util/git-replay-merge.sh
index ec8180c85033206d8c1764a0261a6f21e96c1aa7..8e8710aa9588669f9937253d68ab29ed2d0449cd 100644 (file)
--- a/util/git-replay-merge.sh
+++ b/util/git-replay-merge.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
 #
-# Copyright (C) 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.
 #
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
+# 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/win32utils/build.txt b/win32utils/build.txt
index ae9d1d196750cb5322a0e039a47c509323f9b890..41b598183e01ce5cad301d9bee2f4fe73c70757f 100644 (file)
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
        BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015

diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 49c4cd930db2740237545d25e1092f3726541273..b588ba8300cbfed68b50d1bf312cca46f5334701 100644 (file)
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2004, 2005, 2007-2009, 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004, 2005, 2007-2009, 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2001, 2003  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.