update copyright notice / whitespace

diff --git a/CHANGES b/CHANGES
index 4f1fe7b6080defd454c3c8bd7f33ef227f409dff..4d3cdc7d36e321031716c43844c0d11f59f13930 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-4362.  [func]          Changed rndc reconfig behaviour so that newly added 
-                       zones are loaded asynchronously and the loading does 
+4362.  [func]          Changed rndc reconfig behaviour so that newly added
+                       zones are loaded asynchronously and the loading does
                        not block the server. [RT #41934]
 
 4361.  [cleanup]       Where supported, file modification times returned

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index d3ff2e3a63bfcb0c3110830af008de7d513a46af..4cda543218b0fa6cd00da4c71ccaef679c9127dd 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 69d189dff6995b687c403505353b140501331886..1f4109f6d9a08790cd1141a8d74f40a682c31164 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index ba06a5191045d3ff741dae062dcd6f128571dd32..d8befbbe8300dc2dad4cdf82a7660d8e84385f65 100644 (file)
--- a/bin/named/fuzz.c
+++ b/bin/named/fuzz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015,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
@@ -252,7 +252,7 @@ fuzz_main_resolver(void *arg) {
 
                socklen = sizeof(recvaddr);
                sent = recvfrom(listenfd, rbuf, 65536, 0,
-                               (struct sockaddr *) &recvaddr, &socklen);
+                               (struct sockaddr *) &recvaddr, &socklen);
                RUNTIME_CHECK(sent > 0);
 
                /* Copy QID and set QR so that response is always processed. */
@@ -261,7 +261,7 @@ fuzz_main_resolver(void *arg) {
                buf[2] |= 0x80;
 
                sent = sendto(listenfd, buf, length, 0,
-                             (struct sockaddr *) &recvaddr, sizeof(recvaddr));
+                             (struct sockaddr *) &recvaddr, sizeof(recvaddr));
                RUNTIME_CHECK(sent == length);
 
                /* We might get additional questions here (e.g. for CNAME). */

diff --git a/bin/named/include/named/fuzz.h b/bin/named/include/named/fuzz.h
index c7236112c8677925f6c449873af872add355abb4..2cb183f35683b6a843c9d79b6b1d1052bd957ca8 100644 (file)
--- a/bin/named/include/named/fuzz.h
+++ b/bin/named/include/named/fuzz.h
@@ -1,5 +1,5 @@
 /*
- * 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

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index ae5c30f511f2dc95ffd9a21374ebf02811a79936..65ccba9ae7c526b07a1748abd015ab55e96d6976 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  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/named/include/named/main.h b/bin/named/include/named/main.h
index aa1fcdb5b5a9012cd85b12efb36880dd24e27686..3274aca6aaf6f11b64ad954b9d6dfee860ce90f4 100644 (file)
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2015, 2016  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/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c
index e84f909c01ddd043066cc46635fd84ee1c0af13c..9800f23728fdaed0c3651a3e8da6d7bf4ba763b6 100644 (file)
--- a/bin/pkcs11/pkcs11-list.c
+++ b/bin/pkcs11/pkcs11-list.c
@@ -5,13 +5,13 @@
  * 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 AND NETWORK ASSOCIATES 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.
+ * 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.
  */
 
 /*
@@ -173,13 +173,13 @@ main(int argc, char *argv[]) {
 
        hSession = pctx.session;
 
-       rv = pkcs_C_FindObjectsInit(hSession, search_template, all ? 0 : 1); 
+       rv = pkcs_C_FindObjectsInit(hSession, search_template, all ? 0 : 1);
        if (rv != CKR_OK) {
                fprintf(stderr, "C_FindObjectsInit: Error = 0x%.8lX\n", rv);
                error = 1;
                goto exit_session;
        }
-       
+
        ulObjectCount = 1;
        while (ulObjectCount) {
                rv = pkcs_C_FindObjects(hSession, akey, 50, &ulObjectCount);

diff --git a/bin/tests/system/checkconf/bad-options-also-notify.conf b/bin/tests/system/checkconf/bad-options-also-notify.conf
index 936b6835c0e04f0c965d4da276858ebf8758a13b..f3e46f736ec60bb3379b05a1d525772a5010fcf6 100644 (file)
--- a/bin/tests/system/checkconf/bad-options-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-options-also-notify.conf
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 options {
        also-notify { missing; };
 };

diff --git a/bin/tests/system/checkconf/bad-view-also-notify.conf b/bin/tests/system/checkconf/bad-view-also-notify.conf
index 8e12d217c10dcb55d1afd5ad85ca6890d701c14f..37cc6c24fa7e6183e7b5c105681fa9176c7795a0 100644 (file)
--- a/bin/tests/system/checkconf/bad-view-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-view-also-notify.conf
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 view example {
        also-notify { missing; };
        zone "example.net" {

diff --git a/bin/tests/system/checkconf/good-options-also-notify.conf b/bin/tests/system/checkconf/good-options-also-notify.conf
index f676fb79707f5fc042d4f5b8f7e08a7f472f0311..de3dfed709d49b27c7e8a1e0f9b76d50631376b5 100644 (file)
--- a/bin/tests/system/checkconf/good-options-also-notify.conf
+++ b/bin/tests/system/checkconf/good-options-also-notify.conf
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 options {
        also-notify { missing; };
 };

diff --git a/bin/tests/system/checkconf/good-view-also-notify.conf b/bin/tests/system/checkconf/good-view-also-notify.conf
index 469209641243327f4407529c6066478456562730..f5ea4058b6a60c0885b5c386ad5084356d80f301 100644 (file)
--- a/bin/tests/system/checkconf/good-view-also-notify.conf
+++ b/bin/tests/system/checkconf/good-view-also-notify.conf
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 view example {
        also-notify { missing; };
        zone "example.net" {

diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 5ade8373256b20dc40d0b21727db43dc5d80e1e6..f0e9535d2ad2b256e21a4d3390c40c0eb20ac6f7 100644 (file)
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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

diff --git a/bin/tests/system/rndc/ns6/named.conf.in b/bin/tests/system/rndc/ns6/named.conf.in
index 21c745aa786fec446d61d4e423d2b0f9df829964..53a5626fbfeeb766a55aa6b799294e21a00edded 100644 (file)
--- a/bin/tests/system/rndc/ns6/named.conf.in
+++ b/bin/tests/system/rndc/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * 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

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 4276f3f2a4ada6b19f3123f01efbfc228f36efee..dbfed115cad5d88995ec7e1a03ac39f085a287fe 100644 (file)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 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

diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index b7e3c5b00f9a41013f3d58d9667198746d4a4419..9973921b141d70a753312e8e2be549e0feb11f5a 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 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

diff --git a/bin/tests/system/rpzrecurse/ns3/example.db b/bin/tests/system/rpzrecurse/ns3/example.db
index 4970f143ad6ff0edb2f6db834f41841e6eccefe2..fe2436a66184d2fee77101e5581482efc0e49350 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/example.db
+++ b/bin/tests/system/rpzrecurse/ns3/example.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 0
 @                      SOA     . . 0 0 0 0 0
 @                      NS      ns

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf b/bin/tests/system/rpzrecurse/ns3/named1.conf
index dabea91624844cb9c8db48eb39d43a45dcf8ecd1..f13657b1d89ffb46b1a13c0d70fcb9fb1def3143 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf
@@ -17,7 +17,7 @@
 include "../../common/rndc.key";
 
 controls {
-        inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {

diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf b/bin/tests/system/rpzrecurse/ns3/named2.conf
index edaebdd5328641afec616b3b6b58e244250eb097..3675493feeb2ea78db4b99d4b0b222412f71c6a9 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf
@@ -17,7 +17,7 @@
 include "../../common/rndc.key";
 
 controls {
-        inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {

diff --git a/bin/tests/system/rpzrecurse/ns3/policy.db b/bin/tests/system/rpzrecurse/ns3/policy.db
index 9df59b2ac8933c1c3637793666bd1c62e977872e..fc93be112fbaf81da427297731dad6f0ec41f4b1 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/policy.db
+++ b/bin/tests/system/rpzrecurse/ns3/policy.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 0
 @                      SOA     . . 0 0 0 0 0
 @                      NS      .

diff --git a/bin/tests/system/rpzrecurse/ns3/root.db b/bin/tests/system/rpzrecurse/ns3/root.db
index 7a66e24ea114767a36c3fc74108726ca9e4b700f..582d201682777bbe8432f4eff185a3af3fa345c5 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/root.db
+++ b/bin/tests/system/rpzrecurse/ns3/root.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 0
 @                      SOA     . . 0 0 0 0 0
 @                      NS      ns

diff --git a/bin/tests/system/rpzrecurse/ns4/child.example.db b/bin/tests/system/rpzrecurse/ns4/child.example.db
index 1cba37ad5c2974dd748298dd5e309745a8d3b426..c03160adc3f0e0593ef74e7935d60a520948dc32 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns4/child.example.db
+++ b/bin/tests/system/rpzrecurse/ns4/child.example.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 0
 @                      SOA     . . 0 0 0 0 0
 @                      NS      ns

diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index 132494279496a1913caeb7e4057c85305411b198..ec0442bddc80e696401330fa10146e3bdef68b5f 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  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 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

diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index 18d8fc9eb542ae8352c7165cdbe9bfe21d7c250b..3c8b5fe067efb6827adac834ccc7e5b6edbf0a6c 100644 (file)
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2012, 2014, 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

diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index db38c7e30a7b8fedb3367f0dc285fa0ceae71f8b..156416f9be24b7c6e565df9a072028733b85f356 100644 (file)
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005-2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011, 2012, 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

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 8bf7120a42015945e1e99749d2eab80a884879de..f1f59c3cb3f4befb5f9a46d27874e86ca7604418 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1785,7 +1785,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                        tresult = cfg_map_get(voptions, "also-notify", &obj);
                if (tresult != ISC_R_SUCCESS && goptions != NULL)
                        tresult = cfg_map_get(goptions, "also-notify", &obj);
-               if (tresult == ISC_R_SUCCESS && donotify) {
+               if (tresult == ISC_R_SUCCESS && donotify) {
                        isc_uint32_t count;
                        tresult = validate_masters(obj, config, &count,
                                                   logctx, mctx);

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 6131f1b3a1ee96cd1f86156c9493698c9e820d31..088a87a089a799b625191566fde29188ac2d1084 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  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/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index cf3fcb0c4c8264567f51363be949dac4b7dee4ce..bf53ca89304f72d18af1d52c0545a795f0c3cfa4 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index e8655b75f15b0f87176277bb0bfdb0a0f253745b..86d0b714133651c45b428a26bc2a2fb24714fede 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2015, 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

diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h
index f3f765109dc580086bbdf634dd4f750a0be0d7a8..0e4da41664f12c811c3e5ae70f5e338c039ee079 100644 (file)
--- a/lib/isc/include/isc/httpd.h
+++ b/lib/isc/include/isc/httpd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2008, 2014, 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

diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 88378e495ad2c40ec91981a1bb926307bbb200ad..ef87fc76364244dc1b550ca70384b245965823d3 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 9bc8495ecf2b53d0d78e7aac896d90982ad43f98..8e39a476eab40b5d628ceb0c31d7ac5bd9b21473 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any