From 39f68d7b64dce25e19f7132f6c46b3beabeed492 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Wed, 21 Jan 2015 23:45:24 +0000
Subject: [PATCH] update copyright notice / whitespace

---
 CHANGES                                    |  2 +-
 bin/named/config.c                         |  2 +-
 bin/named/include/named/client.h           |  2 +-
 bin/named/include/named/zoneconf.h         |  2 +-
 bin/named/named.conf.docbook               |  3 ++-
 bin/named/win32/os.c                       |  2 +-
 bin/tests/named.conf                       | 12 ++++++------
 bin/tests/system/Makefile.in               |  2 +-
 bin/tests/system/checkconf/bad-many.conf   |  2 +-
 bin/tests/system/checkconf/good.conf       |  2 +-
 bin/tests/system/conf.sh.in                |  2 +-
 bin/tests/system/pipelined/Makefile.in     |  2 +-
 bin/tests/system/pipelined/clean.sh        |  2 +-
 bin/tests/system/pipelined/ns1/named.conf  |  2 +-
 bin/tests/system/pipelined/ns1/root.db     |  2 +-
 bin/tests/system/pipelined/ns2/examplea.db |  2 +-
 bin/tests/system/pipelined/ns2/named.conf  |  2 +-
 bin/tests/system/pipelined/ns3/exampleb.db |  2 +-
 bin/tests/system/pipelined/ns3/named.conf  |  2 +-
 bin/tests/system/pipelined/ns4/named.conf  |  2 +-
 bin/tests/system/pipelined/setup.sh        |  2 +-
 bin/tests/system/pipelined/tests.sh        |  2 +-
 config.h.win32                             |  2 +-
 lib/dns/dispatch.c                         |  2 +-
 lib/dns/include/dns/dispatch.h             |  2 +-
 lib/dns/include/dns/request.h              |  2 +-
 lib/isc/unix/socket.c                      |  2 +-
 lib/isc/win32/include/isc/win32os.h        |  2 +-
 lib/isc/win32/socket.c                     |  2 +-
 lib/isc/win32/win32os.c                    |  2 +-
 30 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4a1bf8d89c..3250a190e5 100644
--- 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 90530a0493..5f65fa648c 100644
--- 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 7e09dcb53e..961a156aff 100644
--- 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 b89050609b..6123b24a54 100644
--- 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 3b7351f3e5..3dc483cce1 100644
--- 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 1a0efb0b24..364c78fbfb 100644
--- 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 5b4004559a..20ed4d5ea2 100644
--- 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 ae3d62fac4..f0137752e3 100644
--- 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 09add877fb..0061bad231 100644
--- 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 8706ee0fc4..cf886a2427 100644
--- 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 968114ad9f..27bedcf0e0 100644
--- 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 4d16d78fb4..fbb37422a8 100644
--- 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 7c2f213209..ac662c48ab 100644
--- 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 1bbf401c06..974420d4b0 100644
--- 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 b5186e5767..d71276631d 100644
--- 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 678034a216..b575ad2d95 100644
--- 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 83a9ec7a49..9385fcfa45 100644
--- 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 7d10493465..4b44bad204 100644
--- 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 8b15622e55..e3e9096342 100644
--- 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 7e7923a143..748f509ee3 100644
--- 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 6fc981d48c..58e2de9894 100644
--- 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 a34e573686..2561235e06 100644
--- 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 bcd7fdd8d2..59f3971cce 100644
--- 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 325dc718bc..b30a33f5b5 100644
--- 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 14ebf61daa..79ee3aab1a 100644
--- 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 767eea0356..a440ccf59c 100644
--- 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 fea8e87e59..99f26d85f0 100644
--- 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 34978fd414..fe9e0c6a73 100644
--- 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 276b13b0fe..8cf8cf4e1f 100644
--- 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 c02dfc6016..bf18af981b 100644
--- 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