From: Tinderbox User <tbox@isc.org>
Date: Tue, 29 Sep 2015 23:45:32 +0000 (+0000)
Subject: update copyright notice / whitespace
X-Git-Tag: v9.11.0a1~413
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=55cfbf322d6051d7cf5c0ec4998aab9291dfee39;p=thirdparty%2Fbind9.git

update copyright notice / whitespace
---

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index 96d624a21b4..f0bfb91e3fa 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-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/server.c b/bin/named/server.c
index 02665cd97b1..9f5201eb7ae 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1370,9 +1370,9 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
 
 	if (result != ISC_R_SUCCESS)
 		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
-		              NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
-		              "dynamic database '%s' configuration failed: %s",
-		              name, isc_result_totext(result));
+			      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
+			      "dynamic database '%s' configuration failed: %s",
+			      name, isc_result_totext(result));
 	return (result);
 }
 
diff --git a/bin/tests/system/cacheclean/ns2/named.conf b/bin/tests/system/cacheclean/ns2/named.conf
index accfda85587..47aaf27f4ca 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf
+++ b/bin/tests/system/cacheclean/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/checkconf/max-cache-size-good.conf b/bin/tests/system/checkconf/max-cache-size-good.conf
index 952b0221b2c..ccd64dbf712 100644
--- a/bin/tests/system/checkconf/max-cache-size-good.conf
+++ b/bin/tests/system/checkconf/max-cache-size-good.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 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
+ * 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 {
 	max-cache-size 60%;
 };
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 9702b8d171f..1a58783d312 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,4 +1,4 @@
-# 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/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index d35ccbf1ae0..00341954bba 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -15,6 +15,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id$ */
+
 #ifndef ISC_COMMANDLINE_H
 #define ISC_COMMANDLINE_H 1
 
diff --git a/lib/isc/include/isc/meminfo.h b/lib/isc/include/isc/meminfo.h
index 3291a1724e1..60f41c2e926 100644
--- a/lib/isc/include/isc/meminfo.h
+++ b/lib/isc/include/isc/meminfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 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
@@ -26,7 +26,7 @@ ISC_LANG_BEGINDECLS
 isc_uint64_t
 isc_meminfo_totalphys(void);
 /*%<
- * Return total available physical memory in bytes, or 0 if this cannot 
+ * Return total available physical memory in bytes, or 0 if this cannot
  * be determined
 */
 
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index 71150ae0a55..bc50f9d9b66 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 9e2934467ed..3aa8a36a55a 100644
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2014, 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