update copyrights

diff --git a/CHANGES b/CHANGES
index 19f4e365a95f57b3211e568f25d9c2cd85df7c2d..bd72242bd88047a0454ccab0c8cf6f983e9f50f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@
 
                        The recursion depth limit is configured via the
                        "max-recursion-depth" option, and the query limit
-                        via the "max-recursion-queries" option.  [RT #37580]
+                       via the "max-recursion-queries" option.  [RT #37580]
 
 4003.  [security]      When geoip-directory was reconfigured during
                        named run-time, the previously loaded GeoIP

diff --git a/bin/tests/system/geoip/ns2/named6.conf b/bin/tests/system/geoip/ns2/named6.conf
index feab55211178fdcf6e8ea8989b4d1121341ba0d3..847de985d78bf8c5f2a77bef7a9e47ab2352d454 100644 (file)
--- a/bin/tests/system/geoip/ns2/named6.conf
+++ b/bin/tests/system/geoip/ns2/named6.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/reclimit/README b/bin/tests/system/reclimit/README
index 9bac5e6e925e90451b49cd98ef3ad859e685b21b..223a3130556ae6832d8d491cd7975f6320ba639f 100644 (file)
--- a/bin/tests/system/reclimit/README
+++ b/bin/tests/system/reclimit/README
@@ -1,3 +1,6 @@
+Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 system test for recursion limits
 
 ns1  -- root server

diff --git a/bin/tests/system/reclimit/ans2/ans.pl b/bin/tests/system/reclimit/ans2/ans.pl
index ce2615204629f271282155460bce1ded0bfa438e..82bb8749f5b29e79effacea1dc147dd4ff79609d 100644 (file)
--- a/bin/tests/system/reclimit/ans2/ans.pl
+++ b/bin/tests/system/reclimit/ans2/ans.pl
@@ -1,4 +1,18 @@
 #!/usr/bin/env perl
+#
+# 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.
 
 use strict;
 use warnings;

diff --git a/bin/tests/system/reclimit/ans4/ans.pl b/bin/tests/system/reclimit/ans4/ans.pl
index 044385a8b6ec36e9946ec35c86e91921fcf59a47..429069f3a41d627de2ae3c101e8862f97fa4d0bd 100644 (file)
--- a/bin/tests/system/reclimit/ans4/ans.pl
+++ b/bin/tests/system/reclimit/ans4/ans.pl
@@ -1,4 +1,18 @@
 #!/usr/bin/env perl
+#
+# 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.
 
 use strict;
 use warnings;

diff --git a/bin/tests/system/reclimit/ans7/ans.pl b/bin/tests/system/reclimit/ans7/ans.pl
index 0d2dc4bcfbb777c7ed088b46c4ac4a62861eed95..99c2e5bb34396cd386f45e6b7fe6d80df1acc4af 100644 (file)
--- a/bin/tests/system/reclimit/ans7/ans.pl
+++ b/bin/tests/system/reclimit/ans7/ans.pl
@@ -1,4 +1,18 @@
 #!/usr/bin/env perl
+#
+# 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.
 
 use strict;
 use warnings;

diff --git a/util/copyrights b/util/copyrights
index ef43b4b95152134495eba756a2fa7a44dce8fe53..c3e0db78dc43576561fc7447655d3c1a56d2f072 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1331,11 +1331,12 @@
 ./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/named15.conf      CONF-C  2014
 ./bin/tests/system/geoip/ns2/named2.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named3.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named4.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named5.conf       CONF-C  2013
-./bin/tests/system/geoip/ns2/named6.conf       CONF-C  2013
+./bin/tests/system/geoip/ns2/named6.conf       CONF-C  2013,2014
 ./bin/tests/system/geoip/ns2/named7.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named8.conf       CONF-C  2013
 ./bin/tests/system/geoip/ns2/named9.conf       CONF-C  2013
@@ -1531,6 +1532,21 @@
 ./bin/tests/system/pkcs11ssl/setup.sh          SH      2014
 ./bin/tests/system/pkcs11ssl/tests.sh          SH      2014
 ./bin/tests/system/pkcs11ssl/usepkcs11         X       2014
+./bin/tests/system/reclimit/README             TXT.BRIEF       2014
+./bin/tests/system/reclimit/ans2/ans.pl                PERL    2014
+./bin/tests/system/reclimit/ans4/ans.pl                PERL    2014
+./bin/tests/system/reclimit/ans7/ans.pl                PERL    2014
+./bin/tests/system/reclimit/clean.sh           SH      2014
+./bin/tests/system/reclimit/ns1/named.conf     CONF-C  2014
+./bin/tests/system/reclimit/ns1/root.db                ZONE    2014
+./bin/tests/system/reclimit/ns3/.gitignore     X       2014
+./bin/tests/system/reclimit/ns3/hints.db       ZONE    2014
+./bin/tests/system/reclimit/ns3/named1.conf    CONF-C  2014
+./bin/tests/system/reclimit/ns3/named2.conf    CONF-C  2014
+./bin/tests/system/reclimit/ns3/named3.conf    CONF-C  2014
+./bin/tests/system/reclimit/ns3/named4.conf    CONF-C  2014
+./bin/tests/system/reclimit/setup.sh           SH      2014
+./bin/tests/system/reclimit/tests.sh           SH      2014
 ./bin/tests/system/redirect/clean.sh           SH      2011,2012,2013,2014
 ./bin/tests/system/redirect/conf/bad1.conf     CONF-C  2011
 ./bin/tests/system/redirect/conf/bad2.conf     CONF-C  2011
@@ -3379,6 +3395,7 @@
 ./lib/isc/buffer.c                             C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014
 ./lib/isc/bufferlist.c                         C       1999,2000,2001,2004,2005,2007
 ./lib/isc/commandline.c                                C.PORTION       1999,2000,2001,2004,2005,2007,2008,2014
+./lib/isc/counter.c                            C       2014
 ./lib/isc/crc64.c                              C       2013
 ./lib/isc/entropy.c                            C       2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2014
 ./lib/isc/error.c                              C       1998,1999,2000,2001,2004,2005,2007
@@ -3407,6 +3424,7 @@
 ./lib/isc/include/isc/buffer.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014
 ./lib/isc/include/isc/bufferlist.h             C       1999,2000,2001,2004,2005,2006,2007
 ./lib/isc/include/isc/commandline.h            C       1999,2000,2001,2004,2005,2006,2007
+./lib/isc/include/isc/counter.h                        C       2014
 ./lib/isc/include/isc/crc64.h                  C       2013
 ./lib/isc/include/isc/entropy.h                        C       2000,2001,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/error.h                  C       1998,1999,2000,2001,2004,2005,2006,2007,2009
@@ -3569,6 +3587,7 @@
 ./lib/isc/tests/Atffile                                X       2011
 ./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014
 ./lib/isc/tests/aes_test.c                     C       2014
+./lib/isc/tests/counter_test.c                 C       2014
 ./lib/isc/tests/hash_test.c                    C       2011,2012,2013,2014
 ./lib/isc/tests/isctest.c                      C       2011,2012,2013,2014
 ./lib/isc/tests/isctest.h                      C       2011,2012