update copyright notice / whitespace

diff --git a/CHANGES b/CHANGES
index 4a1bf8d89c863f13dc0aa7c5bcced929575567e1..3250a190e5d82b69a350be1fdb5e5c4ad080ef2b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 4044.  [bug]           Change 3955 was not complete, resulting in an assertion
                        failure if the timing was just right. [RT #38352]
 
-4043.  [func]          "rndc modzone" can be used to modify the 
+4043.  [func]          "rndc modzone" can be used to modify the
                        configuration of an existing zone, using similar
                        syntax to "rndc addzone". [RT #37895]
 

diff --git a/bin/named/config.c b/bin/named/config.c
index 90530a0493fb6a9d82ce89c5f0a1a9c637c77d1f..5f65fa648cc29a0b129e2f5a0c2a707f3c5d487d 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 7e09dcb53e82ee378e5d1744827e13d1195fe564..961a156aff0789543719771191f03b94c95d2a71 100644 (file)
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2015  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/zoneconf.h b/bin/named/include/named/zoneconf.h
index b89050609bc0c96ed2df2eceb4d677b0823b8341..6123b24a54f4d520fd25b241837bf7305a7a6652 100644 (file)
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010, 2011, 2015  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/named/named.conf.docbook b/bin/named/named.conf.docbook
index 3b7351f3e5d55e360b39981a3094609dc7e82916..3dc483cce1fcb2cbb144edc4e31cd724fd56d6c6 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2015  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
@@ -46,6 +46,7 @@
       <year>2012</year>
       <year>2013</year>
       <year>2014</year>
+      <year>2015</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 1a0efb0b24db4c6b4fcc7a54079b1faea09da76d..364c78fbfb3aa8126c8f8a3d7965e5877054963f 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2012-2015  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/tests/named.conf b/bin/tests/named.conf
index 5b4004559aa9c02fbba0b20234246fff8f6e7786..20ed4d5ea23557c03d56f6a2dc0ba6727cc6138d 100644 (file)
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -154,7 +154,7 @@ options {
        min-retry-time 1111;
        max-refresh-time 888;
        min-refresh-time 777;
- 
+
        max-ncache-ttl 333;
        min-roots 15;
        serial-queries 34;
@@ -288,7 +288,7 @@ view "test-view" in {
        transfer-source 10.0.0.55;
        transfer-source-v6 4:3:8:1:5:6:7:8;
        query-source port * address 10.0.0.54  ;
-       query-source-v6 address 6:6:6:6:6:6:6:6 port *;
+       query-source-v6 address 6:6:6:6:6:6:6:6 port *;
        max-transfer-time-out 45;
        max-transfer-idle-out 55;
        cleaning-interval 100;
@@ -301,7 +301,7 @@ view "test-view" in {
        min-retry-time 4;
        max-refresh-time 999;
        min-refresh-time 111;
- 
+
        zone "view-zone.com" {
                type master;
                allow-update-forwarding { 10.0.0.34;};
@@ -338,7 +338,7 @@ zone "stub.demo.zone" {
        min-retry-time 11;
        max-refresh-time 12;
        min-refresh-time 13;
- 
+
        max-transfer-time-in 120;       // if not set, global option is used.
        pubkey 257 255 1 "a useless key";
        pubkey 257 255 1 "another useless key";
@@ -615,7 +615,7 @@ logging {
         * channel may be assigned to each of them, and it must be a
         * file channel.  If you don't define them  yourself, they default to
         *
-        *      category eventlib { default_debug; };
+        *      category eventlib { default_debug; };
         *
         *      category packet { default_debug; };
         */

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index ae3d62fac4174ed73781c83d11ce455e41484954..f0137752e36d0aed79a6e65e4b5f35669e40768c 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2008, 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008, 2010-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/checkconf/bad-many.conf b/bin/tests/system/checkconf/bad-many.conf
index 09add877fbfb3aae7765b826b78b1968827a29ce..0061bad2318375a00d8dd61d11737ab6ae93b004 100644 (file)
--- a/bin/tests/system/checkconf/bad-many.conf
+++ b/bin/tests/system/checkconf/bad-many.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2012, 2015  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/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
index 8706ee0fc42845d571ad1e7a7bf0d47978377823..cf886a242776856e35ab5220c40f80dc5f1fece5 100644 (file)
--- a/bin/tests/system/checkconf/good.conf
+++ b/bin/tests/system/checkconf/good.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2010-2015  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/conf.sh.in b/bin/tests/system/conf.sh.in
index 968114ad9f228157d540392c5838bdd491932ba7..27bedcf0e0e9f0af41119789f4e8f1f8e750c9e5 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in
index 4d16d78fb4da6d4d6f94770b6dc708b580b7817b..fbb37422a8fc16e5d3973ac06293812182ff3c1d 100644 (file)
--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  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/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh
index 7c2f21320932f5de399820aae06065dcdcf939b7..ac662c48ab1e47003458471ec4f979d481a1be27 100644 (file)
--- a/bin/tests/system/pipelined/clean.sh
+++ b/bin/tests/system/pipelined/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  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/pipelined/ns1/named.conf b/bin/tests/system/pipelined/ns1/named.conf
index 1bbf401c069e69ec5fba0f276f43cad720a7e263..974420d4b00d5c74373d991b6233f1af784f2d3f 100644 (file)
--- a/bin/tests/system/pipelined/ns1/named.conf
+++ b/bin/tests/system/pipelined/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/pipelined/ns1/root.db b/bin/tests/system/pipelined/ns1/root.db
index b5186e57677fb1154447bb553c61a99ec26a511b..d71276631d27749fec9bcd06ec9ea8e711700772 100644 (file)
--- a/bin/tests/system/pipelined/ns1/root.db
+++ b/bin/tests/system/pipelined/ns1/root.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2014, 2015  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/pipelined/ns2/examplea.db b/bin/tests/system/pipelined/ns2/examplea.db
index 678034a216b0a21141f3dfa3d84e9b11c175e0fd..b575ad2d957436d98098bf3266f78e5a0d8db51d 100644 (file)
--- a/bin/tests/system/pipelined/ns2/examplea.db
+++ b/bin/tests/system/pipelined/ns2/examplea.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2014, 2015  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/pipelined/ns2/named.conf b/bin/tests/system/pipelined/ns2/named.conf
index 83a9ec7a497ecc0915cfbe997c35a63d9274edff..9385fcfa45421b52cf4f3e4de12364c8fdb7e802 100644 (file)
--- a/bin/tests/system/pipelined/ns2/named.conf
+++ b/bin/tests/system/pipelined/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/pipelined/ns3/exampleb.db b/bin/tests/system/pipelined/ns3/exampleb.db
index 7d10493465ac4251d7c6232ce9f389eade82c5fe..4b44bad20418755bc0f4dd5f2a9ce1cf9f4deda6 100644 (file)
--- a/bin/tests/system/pipelined/ns3/exampleb.db
+++ b/bin/tests/system/pipelined/ns3/exampleb.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2014, 2015  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/pipelined/ns3/named.conf b/bin/tests/system/pipelined/ns3/named.conf
index 8b15622e551c72f8264859c1a04b411591c6368e..e3e90963422dd4711aafe42a1db77e01b67eed9e 100644 (file)
--- a/bin/tests/system/pipelined/ns3/named.conf
+++ b/bin/tests/system/pipelined/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/pipelined/ns4/named.conf b/bin/tests/system/pipelined/ns4/named.conf
index 7e7923a14310a10fd6a75ec8f7c8c34b8f09ee96..748f509ee30bd056fe03b04b0274968fe9490718 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf
+++ b/bin/tests/system/pipelined/ns4/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh
index 6fc981d48c6d5a482279e630c87da52c7f090b6b..58e2de9894972769ab52560d0ba130bba3483549 100644 (file)
--- a/bin/tests/system/pipelined/setup.sh
+++ b/bin/tests/system/pipelined/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  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/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index a34e573686eab313c6d6e95bd0d2f28102ef2ac3..2561235e067344d43afcbcbdec0cf670ec48e17f 100644 (file)
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  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/config.h.win32 b/config.h.win32
index bcd7fdd8d292675939e566fc1eddb728f75eac27..59f3971cce241d0917012759019628e8bd536cb8 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 325dc718bcefb6344f3d73c7f323fa1d3b44b99b..b30a33f5b53f64c84486cb0fe39c2cb663404456 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2015  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/dispatch.h b/lib/dns/include/dns/dispatch.h
index 14ebf61daabaa7828e9e0d2ffd8e77977123f704..79ee3aab1a5b6ffe435da115d4ef59d797462d2d 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2015  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/request.h b/lib/dns/include/dns/request.h
index 767eea0356943607fb6f16d562ea41cc9eca8036..a440ccf59c1491d0859b9f97ca08150a194bc357 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2010, 2013-2015  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/isc/unix/socket.c b/lib/isc/unix/socket.c
index fea8e87e590eb9d24b1455a4a85710cd9a1b2441..99f26d85f02341f7dfbea64e9a3143c30287442b 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index 34978fd4149d0f34dfe4f0885357163317bdfa7b..fe9e0c6a73b10dfa86f0baa7bb84ac8c11c6f3c2 100644 (file)
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 276b13b0fe852871dd89a179a4ff8611c511f9ef..8cf8cf4e1fdd7f924f3d39ca07a693bb03e79f60 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index c02dfc6016aa02a998f65c88b7346b5e950479ca..bf18af981b0d87bd9dccc85f91cb6f47720cc225 100644 (file)
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any