copyrights

diff --git a/bin/tests/system/delzone/clean.sh b/bin/tests/system/delzone/clean.sh
index 9a21557ff125564e242248c13fbb308641e4433b..c313f083f99f19d6c8fb04c7fce904d81a66ec60 100644 (file)
--- a/bin/tests/system/delzone/clean.sh
+++ b/bin/tests/system/delzone/clean.sh
@@ -1,18 +1,10 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  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/.
 
 rm -f dig.out.*
 rm -f rndc.out*

diff --git a/bin/tests/system/delzone/ns1/inlineslave.db b/bin/tests/system/delzone/ns1/inlineslave.db
index 6638b1f1a38361d71aa5d55dac4fb95597e161f2..b815bd4bb2b23b3b703cc725840c8ae9851b5384 100644 (file)
--- a/bin/tests/system/delzone/ns1/inlineslave.db
+++ b/bin/tests/system/delzone/ns1/inlineslave.db
@@ -1,16 +1,8 @@
-; Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2016  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/.
 
 $ORIGIN inlineslave.example.
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/delzone/ns1/named.conf b/bin/tests/system/delzone/ns1/named.conf
index 58956c71359a98f3a1f699c63471d9dd9333ecfe..531eb964da3707618122dba8c6b9e7facb8eea63 100644 (file)
--- a/bin/tests/system/delzone/ns1/named.conf
+++ b/bin/tests/system/delzone/ns1/named.conf
@@ -1,17 +1,9 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  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/.
  */
 
 controls { /* empty */ };

diff --git a/bin/tests/system/delzone/ns2/added.db b/bin/tests/system/delzone/ns2/added.db
index 6e17487229bd6a8ac343953e6faf165a98f39adf..a792468bd5d777898d97b8f41f1ef5b6199ff1b7 100644 (file)
--- a/bin/tests/system/delzone/ns2/added.db
+++ b/bin/tests/system/delzone/ns2/added.db
@@ -1,16 +1,8 @@
-; Copyright (C) 2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2016  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/.
 
 ;$ORIGIN added.example.
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/delzone/ns2/named.conf b/bin/tests/system/delzone/ns2/named.conf
index 10a0e66471b652a2b6d2bfd486ab38e2b99e5ac0..503d33416939013eb8b02bc30677da30bd25353a 100644 (file)
--- a/bin/tests/system/delzone/ns2/named.conf
+++ b/bin/tests/system/delzone/ns2/named.conf
@@ -1,17 +1,9 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  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/.
  */
 
 options {
@@ -19,8 +11,8 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
-        allow-query { any; };
-        recursion no;
+       allow-query { any; };
+       recursion no;
        allow-new-zones yes;
 };
 

diff --git a/bin/tests/system/delzone/ns2/normal.db b/bin/tests/system/delzone/ns2/normal.db
index 52deb05eacc95ce54f762be802e9dcd7273c09f1..32f55597d9365691f1c9465576a8413a3994ee94 100644 (file)
--- a/bin/tests/system/delzone/ns2/normal.db
+++ b/bin/tests/system/delzone/ns2/normal.db
@@ -1,16 +1,8 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2016  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/.
 
 $ORIGIN normal.example.
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/delzone/setup.sh b/bin/tests/system/delzone/setup.sh
index 98b3a539ee8fd99bc91ae5337da322b3f42949e2..4089384b36a26b4792dd30ea541635cd2806a571 100644 (file)
--- a/bin/tests/system/delzone/setup.sh
+++ b/bin/tests/system/delzone/setup.sh
@@ -1,18 +1,10 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  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/.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/delzone/tests.sh b/bin/tests/system/delzone/tests.sh
index e7e771613719346a5a91aa4aa9c5d1f21982a768..8bf7a95f5be1a4d1ce30f7dbb832ed99ed233285 100755 (executable)
--- a/bin/tests/system/delzone/tests.sh
+++ b/bin/tests/system/delzone/tests.sh
@@ -1,18 +1,10 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  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/.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nzd2nzf/clean.sh b/bin/tests/system/nzd2nzf/clean.sh
index 83dd60fcd7100b2b1b91ff9297cd2dd9bbbd8553..570ed69f06dd039f56ca7b8228840e1dff81d447 100644 (file)
--- a/bin/tests/system/nzd2nzf/clean.sh
+++ b/bin/tests/system/nzd2nzf/clean.sh
@@ -1,18 +1,10 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  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/.
 
 rm -f dig.out.*
 rm -f rndc.out*

diff --git a/bin/tests/system/nzd2nzf/ns1/added.db b/bin/tests/system/nzd2nzf/ns1/added.db
index 6e17487229bd6a8ac343953e6faf165a98f39adf..a792468bd5d777898d97b8f41f1ef5b6199ff1b7 100644 (file)
--- a/bin/tests/system/nzd2nzf/ns1/added.db
+++ b/bin/tests/system/nzd2nzf/ns1/added.db
@@ -1,16 +1,8 @@
-; Copyright (C) 2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2016  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/.
 
 ;$ORIGIN added.example.
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf b/bin/tests/system/nzd2nzf/ns1/named.conf
index 15475b7fc2bbedb120c98c59a712c4eae7341aef..1cbf8b0c0aa175d7832dfb91147b8a1f4329364b 100644 (file)
--- a/bin/tests/system/nzd2nzf/ns1/named.conf
+++ b/bin/tests/system/nzd2nzf/ns1/named.conf
@@ -1,17 +1,9 @@
 /*
  * Copyright (C) 2016  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/.
  */
 
 options {
@@ -19,8 +11,8 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.1; };
        listen-on-v6 { none; };
-        allow-query { any; };
-        recursion no;
+       allow-query { any; };
+       recursion no;
        allow-new-zones yes;
 };
 

diff --git a/bin/tests/system/nzd2nzf/prereq.sh b/bin/tests/system/nzd2nzf/prereq.sh
index d34fd30f7e5bf7879d1ee0b55936d6b58e1c28f6..0a8fd5bd2b18b0bfd7ccc7ff978b224f34019272 100644 (file)
--- a/bin/tests/system/nzd2nzf/prereq.sh
+++ b/bin/tests/system/nzd2nzf/prereq.sh
@@ -1,16 +1,8 @@
 # Copyright (C) 2016  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/.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh
index c82253db3e401ad2a9219e50ebdfc9d77d3a9129..4089384b36a26b4792dd30ea541635cd2806a571 100644 (file)
--- a/bin/tests/system/nzd2nzf/setup.sh
+++ b/bin/tests/system/nzd2nzf/setup.sh
@@ -2,17 +2,9 @@
 #
 # Copyright (C) 2016  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/.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh
index a030e8b1450e88c99be6a6af8137ae9a6d1560c2..cfdc6cdeda2ba1182d2fc9884ab09fdbed85cb0f 100644 (file)
--- a/bin/tests/system/nzd2nzf/tests.sh
+++ b/bin/tests/system/nzd2nzf/tests.sh
@@ -1,16 +1,8 @@
 # Copyright (C) 2016  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/.
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c
index f9bae77686a3fed08b19a8761d0087d46796248a..f2ee317b923ba45339c3551e5242bd0e6dadbfdf 100644 (file)
--- a/bin/tools/named-nzd2nzf.c
+++ b/bin/tools/named-nzd2nzf.c
@@ -1,17 +1,9 @@
 /*
  * Copyright (C) 2016  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/.
  */
 
 #include "config.h"
@@ -91,7 +83,7 @@ main (int argc, char *argv[]) {
 
                /* zone zonename { config; }; */
                printf("zone \"%.*s\" %.*s;\n",
-                      (int) key.mv_size, (char *) key.mv_data, 
+                      (int) key.mv_size, (char *) key.mv_data,
                       (int) data.mv_size, (char *) data.mv_data);
        }
 

diff --git a/bin/tools/named-nzd2nzf.docbook b/bin/tools/named-nzd2nzf.docbook
index 4aa3852556b0e53c8ce140db8d5e0a6940846fff..c0413312b812c29362fc613ad0161ca93c0d2027 100644 (file)
--- a/bin/tools/named-nzd2nzf.docbook
+++ b/bin/tools/named-nzd2nzf.docbook
@@ -2,19 +2,11 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2009, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2016  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/.
 -->
 
 <refentry id="man.named-nzd2nzf">

diff --git a/util/copyrights b/util/copyrights
index b50941b201f7d9bf622493f219cc7cb9b708697e..7e8277c826167cd3379ba426c46a919384d3df2c 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -3,7 +3,7 @@
 ./Atffile                                      X       2011
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./COPYRIGHT                                    TXT     1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
-./FAQ                                          X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015
+./FAQ                                          X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016
 ./FAQ.xml                                      SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016
 ./HISTORY                                      X       2010,2013,2016
 ./LICENSE                                      X       2016
@@ -1101,6 +1101,15 @@
 ./bin/tests/system/database/ns1/named.conf2    CONF-C  2011,2013,2016
 ./bin/tests/system/database/setup.sh           SH      2011,2012,2016
 ./bin/tests/system/database/tests.sh           SH      2011,2012,2016
+./bin/tests/system/delzone/clean.sh            SH      2016
+./bin/tests/system/delzone/ns1/inlineslave.db  ZONE    2016
+./bin/tests/system/delzone/ns1/named.conf      CONF-C  2016
+./bin/tests/system/delzone/ns2/added.db                ZONE    2016
+./bin/tests/system/delzone/ns2/named.args      X       2016
+./bin/tests/system/delzone/ns2/named.conf      CONF-C  2016
+./bin/tests/system/delzone/ns2/normal.db       ZONE    2016
+./bin/tests/system/delzone/setup.sh            SH      2016
+./bin/tests/system/delzone/tests.sh            SH      2016
 ./bin/tests/system/dialup/ns1/example.db       ZONE    2000,2001,2004,2007,2016
 ./bin/tests/system/dialup/ns1/named.conf       CONF-C  2000,2001,2004,2007,2016
 ./bin/tests/system/dialup/ns1/root.db          ZONE    2000,2001,2004,2007,2016
@@ -1350,7 +1359,7 @@
 ./bin/tests/system/dyndb/clean.sh              SH      2015,2016
 ./bin/tests/system/dyndb/driver/.gitignore     X       2015
 ./bin/tests/system/dyndb/driver/AUTHORS                X       2015
-./bin/tests/system/dyndb/driver/COPYING                X       2015
+./bin/tests/system/dyndb/driver/COPYING                X       2015,2016
 ./bin/tests/system/dyndb/driver/Makefile.in    MAKE    2015,2016
 ./bin/tests/system/dyndb/driver/README         X       2015
 ./bin/tests/system/dyndb/driver/db.c           X       2015,2016
@@ -1610,6 +1619,9 @@
 ./bin/tests/system/keymgr/16-wrongalg-unspec/expect    X       2016
 ./bin/tests/system/keymgr/17-noforce/README    TXT.BRIEF       2016
 ./bin/tests/system/keymgr/17-noforce/expect    X       2016
+./bin/tests/system/keymgr/18-nonstd-prepub/README      TXT.BRIEF       2016
+./bin/tests/system/keymgr/18-nonstd-prepub/expect      X       2016
+./bin/tests/system/keymgr/18-nonstd-prepub/policy.conf CONF-C  2016
 ./bin/tests/system/keymgr/clean.sh             SH      2016
 ./bin/tests/system/keymgr/policy.conf          CONF-C  2016
 ./bin/tests/system/keymgr/policy.good          X       2016
@@ -1752,6 +1764,7 @@
 ./bin/tests/system/notify/setup.sh             SH      2000,2001,2004,2007,2012,2014,2016
 ./bin/tests/system/notify/tests.sh             SH      2000,2001,2004,2007,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/nslookup/clean.sh           SH      2014,2015,2016
+./bin/tests/system/nslookup/ns1/example.net.db ZONE    2016
 ./bin/tests/system/nslookup/ns1/named.conf     CONF-C  2014,2016
 ./bin/tests/system/nslookup/setup.sh           SH      2014,2016
 ./bin/tests/system/nslookup/tests.sh           SH      2014,2016
@@ -1776,6 +1789,12 @@
 ./bin/tests/system/nsupdate/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/nsupdate/update_test.pl     PERL    2000,2001,2004,2007,2012,2016
 ./bin/tests/system/nsupdate/verylarge          X       2013
+./bin/tests/system/nzd2nzf/clean.sh            SH      2016
+./bin/tests/system/nzd2nzf/ns1/added.db                ZONE    2016
+./bin/tests/system/nzd2nzf/ns1/named.conf      CONF-C  2016
+./bin/tests/system/nzd2nzf/prereq.sh           SH      2016
+./bin/tests/system/nzd2nzf/setup.sh            SH      2016
+./bin/tests/system/nzd2nzf/tests.sh            SH      2016
 ./bin/tests/system/org.isc.bind.system         SH      2010,2012,2013,2016
 ./bin/tests/system/org.isc.bind.system.plist   X       2010
 ./bin/tests/system/packet.pl                   PERL    2011,2012,2016
@@ -2511,7 +2530,7 @@
 ./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,2016
-./bin/tools/.gitignore                         X       2012,2014,2015
+./bin/tools/.gitignore                         X       2012,2014,2015,2016
 ./bin/tools/Makefile.in                                MAKE    2009,2010,2012,2013,2014,2015,2016
 ./bin/tools/arpaname.1                         MAN     DOCBOOK
 ./bin/tools/arpaname.c                         C       2009,2015,2016
@@ -2537,6 +2556,10 @@
 ./bin/tools/named-journalprint.c               C       2000,2001,2004,2005,2006,2007,2008,2009,2015,2016
 ./bin/tools/named-journalprint.docbook         SGML    2009,2014,2015,2016
 ./bin/tools/named-journalprint.html            HTML    DOCBOOK
+./bin/tools/named-nzd2nzf.8                    MAN     DOCBOOK
+./bin/tools/named-nzd2nzf.c                    C       2016
+./bin/tools/named-nzd2nzf.docbook              SGML    2016
+./bin/tools/named-nzd2nzf.html                 HTML    DOCBOOK
 ./bin/tools/named-rrchecker.1                  MAN     DOCBOOK
 ./bin/tools/named-rrchecker.c                  C       2013,2015,2016
 ./bin/tools/named-rrchecker.docbook            SGML    2013,2014,2015,2016
@@ -2628,20 +2651,20 @@
 ./contrib/dane/tlsa6698.pem                    X       2012
 ./contrib/dlz/.gitignore                       X       2014
 ./contrib/dlz/bin/.gitignore                   X       2014
-./contrib/dlz/bin/dlzbdb/Makefile.in           X       2005,2007,2009,2011,2012,2015
-./contrib/dlz/bin/dlzbdb/dlzbdb.c              X       2005
+./contrib/dlz/bin/dlzbdb/Makefile.in           X       2005,2007,2009,2011,2012,2015,2016
+./contrib/dlz/bin/dlzbdb/dlzbdb.c              X       2005,2016
 ./contrib/dlz/config.dlz.in                    X       2005,2006,2008,2010,2011,2014,2016
 ./contrib/dlz/drivers/.gitignore               X       2012
-./contrib/dlz/drivers/dlz_bdb_driver.c         X       2005,2008,2010,2011,2012
-./contrib/dlz/drivers/dlz_bdbhpt_driver.c      X       2005,2010,2011,2012
+./contrib/dlz/drivers/dlz_bdb_driver.c         X       2005,2008,2010,2011,2012,2016
+./contrib/dlz/drivers/dlz_bdbhpt_driver.c      X       2005,2010,2011,2012,2016
 ./contrib/dlz/drivers/dlz_dlopen_driver.c      X       2010,2011
 ./contrib/dlz/drivers/dlz_drivers.c            X       2005,2010,2011
-./contrib/dlz/drivers/dlz_filesystem_driver.c  X       2005,2010,2011,2012
-./contrib/dlz/drivers/dlz_ldap_driver.c                X       2005,2010,2011,2012
-./contrib/dlz/drivers/dlz_mysql_driver.c       X       2005,2007,2009,2010,2011,2012
-./contrib/dlz/drivers/dlz_odbc_driver.c                X       2005,2010,2011,2012,2014
-./contrib/dlz/drivers/dlz_postgres_driver.c    X       2005,2007,2010,2011,2012,2014
-./contrib/dlz/drivers/dlz_stub_driver.c                X       2005,2010,2011,2012
+./contrib/dlz/drivers/dlz_filesystem_driver.c  X       2005,2010,2011,2012,2016
+./contrib/dlz/drivers/dlz_ldap_driver.c                X       2005,2010,2011,2012,2016
+./contrib/dlz/drivers/dlz_mysql_driver.c       X       2005,2007,2009,2010,2011,2012,2016
+./contrib/dlz/drivers/dlz_odbc_driver.c                X       2005,2010,2011,2012,2014,2016
+./contrib/dlz/drivers/dlz_postgres_driver.c    X       2005,2007,2010,2011,2012,2014,2016
+./contrib/dlz/drivers/dlz_stub_driver.c                X       2005,2010,2011,2012,2016
 ./contrib/dlz/drivers/include/dlz/dlz_bdb_driver.h     X       2005
 ./contrib/dlz/drivers/include/dlz/dlz_bdbhpt_driver.h  X       2005
 ./contrib/dlz/drivers/include/dlz/dlz_dlopen_driver.h  X       2010,2011
@@ -2654,12 +2677,12 @@
 ./contrib/dlz/drivers/include/dlz/dlz_stub_driver.h    X       2005
 ./contrib/dlz/drivers/include/dlz/sdlz_helper.h        X       2005
 ./contrib/dlz/drivers/rules.in                 X       2005,2010
-./contrib/dlz/drivers/sdlz_helper.c            X       2005,2010,2011,2012
+./contrib/dlz/drivers/sdlz_helper.c            X       2005,2010,2011,2012,2016
 ./contrib/dlz/example/Makefile                 X       2010,2013
 ./contrib/dlz/example/README                   X       2011,2012,2013,2014
 ./contrib/dlz/example/dlz_example.c            X       2010,2011,2012,2013,2014
 ./contrib/dlz/example/named.conf               X       2011,2014
-./contrib/dlz/example/win32/DLLMain.c          X       2011
+./contrib/dlz/example/win32/DLLMain.c          X       2011,2016
 ./contrib/dlz/example/win32/dxdriver.def       X       2011
 ./contrib/dlz/example/win32/dxdriver.dsw       X       2011
 ./contrib/dlz/modules/bdbhpt/Makefile          X       2013
@@ -2669,17 +2692,17 @@
 ./contrib/dlz/modules/bdbhpt/testing/bdbhpt-populate.pl        X       2013
 ./contrib/dlz/modules/bdbhpt/testing/dns-data.txt      X       2013,2015
 ./contrib/dlz/modules/bdbhpt/testing/named.conf        X       2015
-./contrib/dlz/modules/common/dlz_dbi.c         X       2013,2014
+./contrib/dlz/modules/common/dlz_dbi.c         X       2013,2014,2016
 ./contrib/dlz/modules/filesystem/Makefile      X       2013
 ./contrib/dlz/modules/filesystem/dir.c         X       2013
 ./contrib/dlz/modules/filesystem/dir.h         X       2013
 ./contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c      X       2013,2015,2016
 ./contrib/dlz/modules/include/dlz_dbi.h                X       2013
-./contrib/dlz/modules/include/dlz_list.h       X       2013
+./contrib/dlz/modules/include/dlz_list.h       X       2013,2016
 ./contrib/dlz/modules/include/dlz_minimal.h    X       2013,2014
 ./contrib/dlz/modules/include/dlz_pthread.h    X       2013,2014,2015
 ./contrib/dlz/modules/ldap/Makefile            X       2013
-./contrib/dlz/modules/ldap/dlz_ldap_dynamic.c  X       2013
+./contrib/dlz/modules/ldap/dlz_ldap_dynamic.c  X       2013,2016
 ./contrib/dlz/modules/ldap/testing/README      X       2013
 ./contrib/dlz/modules/ldap/testing/dlz.schema  X       2013
 ./contrib/dlz/modules/ldap/testing/example.ldif        X       2013
@@ -2702,7 +2725,7 @@
 ./contrib/dlz/modules/perl/README              X       2013
 ./contrib/dlz/modules/perl/dlz_perl_callback.xs        X       2013
 ./contrib/dlz/modules/perl/dlz_perl_callback_clientinfo.xs     X       2013
-./contrib/dlz/modules/perl/dlz_perl_driver.c   X       2013,2015
+./contrib/dlz/modules/perl/dlz_perl_driver.c   X       2013,2015,2016
 ./contrib/dlz/modules/perl/dlz_perl_driver.h   X       2013
 ./contrib/dlz/modules/perl/testing/dlz_perl_example.pm X       2013
 ./contrib/dlz/modules/perl/testing/named.conf  X       2013
@@ -2714,7 +2737,7 @@
 ./contrib/dlz/modules/sqlite3/testing/named.conf       X       2014
 ./contrib/dlz/modules/wildcard/Makefile                X       2013
 ./contrib/dlz/modules/wildcard/README          X       2013
-./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c  X       2013,2015
+./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c  X       2013,2015,2016
 ./contrib/dlz/modules/wildcard/testing/named.conf      X       2013
 ./contrib/dnsperf-2.1.0.0-1/Makefile.in                X       2016
 ./contrib/dnsperf-2.1.0.0-1/README             X       2016
@@ -2987,7 +3010,7 @@
 ./contrib/query-loc-0.4.0/install-sh           X       2008
 ./contrib/query-loc-0.4.0/loc.c                        X       2008,2013,2015
 ./contrib/query-loc-0.4.0/loc.h                        X       2008,2015
-./contrib/query-loc-0.4.0/loc_ntoa.c           X       2008,2014
+./contrib/query-loc-0.4.0/loc_ntoa.c           X       2008,2014,2016
 ./contrib/query-loc-0.4.0/query-loc.1          X       2008
 ./contrib/query-loc-0.4.0/query-loc.c          X       2008
 ./contrib/query-loc-0.4.0/reconf               X       2008
@@ -3028,9 +3051,9 @@
 ./contrib/sdb/pgsql/pgsqldb.h                  C       2000,2001,2004,2007,2016
 ./contrib/sdb/pgsql/zonetodb.c                 C       2000,2001,2002,2004,2005,2007,2008,2009,2014,2016
 ./contrib/sdb/sqlite/README.sdb_sqlite         X       2007
-./contrib/sdb/sqlite/sqlitedb.c                        X       2007,2011,2014
-./contrib/sdb/sqlite/sqlitedb.h                        X       2007
-./contrib/sdb/sqlite/zone2sqlite.c             X       2007,2008,2009,2010,2013,2014
+./contrib/sdb/sqlite/sqlitedb.c                        X       2007,2011,2014,2016
+./contrib/sdb/sqlite/sqlitedb.h                        X       2007,2016
+./contrib/sdb/sqlite/zone2sqlite.c             X       2007,2008,2009,2010,2013,2014,2016
 ./contrib/sdb/tcl/lookup.tcl                   TCL     2000,2001,2004,2007,2012,2016
 ./contrib/sdb/tcl/tcldb.c                      C       2000,2001,2004,2007,2011,2014,2016
 ./contrib/sdb/tcl/tcldb.h                      C       2000,2001,2004,2007,2016
@@ -3314,8 +3337,8 @@
 ./doc/xsl/isc-notes-html.xsl.in                        SGML    2015,2016
 ./doc/xsl/notes-param.xsl                      SGML    2015,2016
 ./doc/xsl/pre-latex.xsl                                SGML    2005,2007,2015,2016
-./docutil/HTML_COPYRIGHT                       X       2001,2004
-./docutil/MAN_COPYRIGHT                                X       2001,2004
+./docutil/HTML_COPYRIGHT                       X       2001,2004,2016
+./docutil/MAN_COPYRIGHT                                X       2001,2004,2016
 ./docutil/patch-db2latex-duplicate-template-bug        X       2007
 ./docutil/patch-db2latex-nested-param-bug      X       2007
 ./docutil/patch-db2latex-xsltproc-title-bug    X       2007
@@ -4817,7 +4840,7 @@
 ./win32utils/build.txt                         TXT.BRIEF       2013,2014,2015,2016
 ./win32utils/index.html                                HTML    2006,2007,2008,2012,2013,2014,2015,2016
 ./win32utils/legacy/BINDBuild.dsw.in           X       2001,2005,2006,2008,2009,2010,2013,2014,2015
-./win32utils/legacy/BuildAll.bat.in            BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015
+./win32utils/legacy/BuildAll.bat.in            BAT     2001,2002,2004,2005,2006,2007,2008,2009,2010,2013,2014,2015,2016
 ./win32utils/legacy/BuildPost.bat.in           BAT     2005,2006,2013,2014,2016
 ./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,2016