From: Tinderbox User <tbox@isc.org>
Date: Fri, 22 Aug 2014 23:46:55 +0000 (+0000)
Subject: update copyright notice
X-Git-Tag: v9.8.8rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c8b7a2df8cd86f6cab84297d35de1391189648c;p=thirdparty%2Fbind9.git

update copyright notice
---

diff --git a/CHANGES b/CHANGES
index 369b5439f19..8f25e2687d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@
 
 3919.	[bug]		dig: continue to next line if a address lookup fails
 			in batch mode. [RT #36755]
-			
+
 3918.	[doc]		Update check-spf documentation. [RT #36910]
 
 3917.	[bug]		dig, nslookup and host now continue on names that are
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index a127337c70e..f5123abcce3 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1549,7 +1549,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 		if (strncmp(rv[0], "%", 1) == 0)
 			break;
 		if (rv[0][0] == '@') {
-			
+
 			if (is_batchfile && !config_only) {
 				addresscount = getaddresses(lookup, &rv[0][1],
 							     &result);
@@ -1557,14 +1557,14 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 					fprintf(stderr, "couldn't get address "
 						"for '%s': %s: skipping "
 						"lookup\n", &rv[0][1],
-					        isc_result_totext(result));
+						isc_result_totext(result));
 					if (ISC_LINK_LINKED(lookup, link))
 						ISC_LIST_DEQUEUE(lookup_list,
 								 lookup, link);
 					destroy_lookup(lookup);
 					return;
 				}
-			} else 
+			} else
 				addresscount = getaddresses(lookup, &rv[0][1],
 							    NULL);
 		} else if (rv[0][0] == '+') {
diff --git a/bin/named/control.c b/bin/named/control.c
index 590bbd5731e..ac719812a99 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2010, 2012-2014  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/server.h b/bin/named/include/named/server.h
index 1f8fb1180d9..851d6d3e9aa 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013, 2014  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/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index 6efbef16742..7e4575917a0 100644
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007, 2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2010, 2013, 2014  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/dnssec/ns2/in-addr.arpa.db.in b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
index d60b717ef1e..b62197c0899 100644
--- a/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
+++ b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
@@ -1,3 +1,17 @@
+; Copyright (C) 2014  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 3600
 @	SOA	ns2.example. . 1 3600 1200 86400 1200
 @	NS	ns2.example.
diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf
index 9b9cfbcee11..8db64ec11c1 100644
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008, 2010, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -65,8 +65,8 @@ zone "insecure.secure.example" {
 };
 
 zone "rfc2335.example" {
-        type master;
-        file "rfc2335.example.db";
+	type master;
+	file "rfc2335.example.db";
 };
 
 zone "child.nsec3.example" {