[master] update copyrights

diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index bd6d2e8bc023f4ef990e5e35fcf4b9e79423a552..cb4fb59bbd2f5fa79c9d29313d2a2b835e133556 100644 (file)
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index 9bb9e26c1fe0106f3d1a24d285c5332c76a843ae..5d8404cf201e8f7caf434b15fb9add3d31b2dba4 100644 (file)
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2004, 2007, 2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001-2004, 2007, 2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index abee0320467b43b5d1ee75dd98b17c81147559cb..42b9ebf4b6b6c6ce65f4f9e1dcdb0092064d7e34 100644 (file)
--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,7 +18,7 @@ CDEFINES =
 CWARNINGS =
 
 DNSLIBS =
-ISCLIBS =      ../../../../lib/isc/libisc.@A@
+ISCLIBS =      ../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 
 DNSDEPLIBS =
 ISCDEPLIBS =    ../../../../lib/isc/libisc.@A@

diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index ffe1c4fd9005d5aba97d167b5e7977d4d00942b9..c3464b641fe6d66303008203e986773c31909d7b 100644 (file)
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c
index 04605b20be1326b4ff97d56761c1372440d4cd8c..6e26106032b1cd67adc5907ddd2c6058d2b7f4dc 100644 (file)
--- a/bin/tests/system/rpz/dnsrps.c
+++ b/bin/tests/system/rpz/dnsrps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/dnsrpzd.conf b/bin/tests/system/rpz/dnsrpzd.conf
index de73945ed103a405f8c6b870a9cd9ecb6a4ab3be..8ae5d617c6bf0498c95a2f171b22ed166000b618 100644 (file)
--- a/bin/tests/system/rpz/dnsrpzd.conf
+++ b/bin/tests/system/rpz/dnsrpzd.conf
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 # dnsrpzd configuration.
 
 pid-file ../dnsrpzd.pid

diff --git a/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index 3adb543fb286f00bd41694a8b31cde0e538aaa6f..02a93c4252fdba6907d7c6feaa34c06c56079e21 100644 (file)
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/ns5/tld5.db b/bin/tests/system/rpz/ns5/tld5.db
index 432b3e6de0b80792fcd0db28ce8bf02c35d146e8..3671b1b82f7914ab64acbe42bcee8dde7d10d5d6 100644 (file)
--- a/bin/tests/system/rpz/ns5/tld5.db
+++ b/bin/tests/system/rpz/ns5/tld5.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index 0cdc7524b9504d659fb267033fc831363259ca50..f9035c0c335002e36b54a534eb34ae999f7d23af 100644 (file)
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,4 +1,4 @@
-; Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index beca0d3bf0eba0060aca9f5a89be973c96be4153..de04403f68f3ce4509e7fa5f89b1534c6d4772c6 100644 (file)
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,4 +1,4 @@
-; Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index 3c23011d5fee42ee2ce3470a15895a7b7d7ad3f7..63997159e5033069ef66f7d94a5da6e1967d6d1d 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf b/bin/tests/system/rpzrecurse/ns1/named.conf
index 012e6cb2d78dbc4fb1b89756e293ff86c6041855..0b0f268f59288423bac73eb1bab818ec78064d50 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns1/named.conf
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
index 3245032ad5fcf13de58d3c0dab874ea6ec5df024..46b33fcdc241b6baac60a1e40dd738b4216965bb 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
index a987854c984b34c6f40852d6c8addd05b2d5320d..dcea7a9e18fed5953350f0cea3a8bfab61e65bcb 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header b/bin/tests/system/rpzrecurse/ns2/named.conf.header
index 09608bf68f660d275222b4d0feb7f5ba19eedc07..3fdd026b9fc2b4bbd4458dbf993dc374dbc83850 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.log.conf b/bin/tests/system/rpzrecurse/ns2/named.log.conf
index 52b4b4fa3af6dfd0dc4d33ab81a9ce035232d240..d8d935198dc779e02c06e4cebb0e4300f6c4bb87 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.log.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.log.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
index cc73a5fae1d99d99295577fc58f67646fc6ecf3a..8b0d2bcb04a70fba86ad5722e8bd29b6e3baf9ed 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
index f20a77e606cbe609c7513ba27d1963283daddf56..db9d28170fd52fc36e22779e53b4a44341e0c80e 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
index 801d7479a3af35e3670d4adf3b163d78ed1b63a1..9eeea4295a61fad349828b29e3cc08b3d847d409 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf b/bin/tests/system/rpzrecurse/ns3/named1.conf
index fada50b98c0263274194331c5549d7fea15c2270..c98c8c9182b1c0a2783c525d4d15ff0dd09a1873 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf b/bin/tests/system/rpzrecurse/ns3/named2.conf
index 7d3292b8fe8f234bca940ead99ab35d070fc5e00..f7b9e9ef615d5fc1332d03431b8e512ca599751a 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf b/bin/tests/system/rpzrecurse/ns4/named.conf
index d679aae283ea8b93d572b043be91370199233c90..f76d7bce1cebfe4baf611adb6ed39bd933501c81 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns4/named.conf
+++ b/bin/tests/system/rpzrecurse/ns4/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/prereq.sh b/bin/tests/system/rpzrecurse/prereq.sh
index 84b419bf60f65f3e06d334b6f35fec59e9023e43..5cb78129857bff6cae85dd250a5f5e1c81c22dfc 100644 (file)
--- a/bin/tests/system/rpzrecurse/prereq.sh
+++ b/bin/tests/system/rpzrecurse/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index fc94134f7b1e8d8a39d5366ca4bdc53b4ad22fd1..d4524043e9a7a03186c212bd006d9039bfd0e409 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/rpzrecurse/testgen.pl b/bin/tests/system/rpzrecurse/testgen.pl
index 9c90a6e36132725e82b9290464befa7e462fa753..c39a20eebb5c83305b83943236edf104dbc49147 100755 (executable)
--- a/bin/tests/system/rpzrecurse/testgen.pl
+++ b/bin/tests/system/rpzrecurse/testgen.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index 9b2a8515c7d899deb071299b1a8b7477cba4fce9..c19137406cb0ffa9a22bbbefc38e5386ba354f29 100644 (file)
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c
index 4c38732a50684dbd5e4fba942698acbd9c1707a8..4c52be30682943ce691c173d32971167ae9b307e 100644 (file)
--- a/lib/dns/dnsrps.c
+++ b/lib/dns/dnsrps.c
@@ -1,17 +1,9 @@
 /*
  * Copyright (C) 2017  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 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/.
  */
 
 /*! \file */

diff --git a/lib/dns/include/dns/dnsrps.h b/lib/dns/include/dns/dnsrps.h
index f0acc4f5c48cc1639757bc4b4f2c61ac3e0d7159..c0eb2058e2812cf2ece144f1a84b32de0a39e99a 100644 (file)
--- a/lib/dns/include/dns/dnsrps.h
+++ b/lib/dns/include/dns/dnsrps.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
 #ifndef DNS_DNSRPS_H
 #define DNS_DNSRPS_H
 

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 36e4134593134fc7528327dd86fad26328113d05..87065e0ad35ff512ab39878b6981bc20f0a61866 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2009, 2011, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this