update copyrights

diff --git a/bin/tests/system/geoip/ns2/named11.conf b/bin/tests/system/geoip/ns2/named11.conf
index 1ceece41cfb5215aa24f8237124b10bd07868f27..7770619205227041fc5601666355a4bc85bfb3f7 100644 (file)
--- a/bin/tests/system/geoip/ns2/named11.conf
+++ b/bin/tests/system/geoip/ns2/named11.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014  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/geoip/ns2/named12.conf b/bin/tests/system/geoip/ns2/named12.conf
index 85c0d32c34b68cfeab1baa94ba8027fc4da57e2d..a5025022a90964db4ee19f47a326f115ca25e29e 100644 (file)
--- a/bin/tests/system/geoip/ns2/named12.conf
+++ b/bin/tests/system/geoip/ns2/named12.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014  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/sit/bad-sit-badhex.conf b/bin/tests/system/sit/bad-sit-badhex.conf
index 6b84d8a6a12b2aaac580e4d66764558384ec51ad..f61ea93fd497fc3f2040cbc3b4102fbe4e87aae5 100644 (file)
--- a/bin/tests/system/sit/bad-sit-badhex.conf
+++ b/bin/tests/system/sit/bad-sit-badhex.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2014  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.
+ */
+
 options {
        sit-secret "012345678901234567890123456789012345678901234567890123456789012";
 };

diff --git a/bin/tests/system/sit/bad-sit-toolong.conf b/bin/tests/system/sit/bad-sit-toolong.conf
index aec4d252c8aacb58bb074ca2b9e0cf3d9a9c0052..812f9d808e5261055181a9d509aef962d995efc0 100644 (file)
--- a/bin/tests/system/sit/bad-sit-toolong.conf
+++ b/bin/tests/system/sit/bad-sit-toolong.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2014  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.
+ */
+
 options {
        sit-secret "01234567890123456789012345678901234567890123456789012345678901234567890";
 };

diff --git a/util/copyrights b/util/copyrights
index 87ff5ed1099500322596f40b701bed1235ff1d42..f5aefc8d444ee72616ee83e725722c85f05993a1 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1322,8 +1322,8 @@
 ./bin/tests/system/geoip/ns2/example.db.in     ZONE    2013
 ./bin/tests/system/geoip/ns2/named1.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named10.conf      CONF-C  2014
-./bin/tests/system/geoip/ns2/named11.conf      CONF-C  2013
-./bin/tests/system/geoip/ns2/named12.conf      CONF-C  2013
+./bin/tests/system/geoip/ns2/named11.conf      CONF-C  2013,2014
+./bin/tests/system/geoip/ns2/named12.conf      CONF-C  2013,2014
 ./bin/tests/system/geoip/ns2/named13.conf      CONF-C  2014
 ./bin/tests/system/geoip/ns2/named14.conf      CONF-C  2014
 ./bin/tests/system/geoip/ns2/named2.conf       CONF-C  2013
@@ -1718,6 +1718,8 @@
 ./bin/tests/system/send.pl                     PERL    2001,2004,2007,2011,2012
 ./bin/tests/system/setup.sh                    SH      2000,2001,2004,2007,2012,2014
 ./bin/tests/system/sit/.gitignore              X       2014
+./bin/tests/system/sit/bad-sit-badhex.conf     CONF-C  2014
+./bin/tests/system/sit/bad-sit-toolong.conf    CONF-C  2014
 ./bin/tests/system/sit/clean.sh                        SH      2014
 ./bin/tests/system/sit/ns1/example.db          ZONE    2014
 ./bin/tests/system/sit/ns1/named.conf          CONF-C  2014