From: Tinderbox User <tbox@isc.org>
Date: Tue, 25 Aug 2015 23:46:19 +0000 (+0000)
Subject: update copyright notice / whitespace
X-Git-Tag: v9.9.8~21
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5ad0557d5beaa984b51163c2e156351cf14ebf6e;p=thirdparty%2Fbind9.git

update copyright notice / whitespace
---

diff --git a/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db b/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
index 3e69f23cde8..5f342119bb1 100644
--- a/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
+++ b/bin/tests/system/checkzone/zones/bad-dns-sd-reverse.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 	60
 @	IN	SOA	. . 0 0 0 0 0
 @	IN	NS	.
diff --git a/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db b/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
index 5b9963d681e..0f017caaa80 100644
--- a/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
+++ b/bin/tests/system/checkzone/zones/good-dns-sd-reverse.db
@@ -1,3 +1,17 @@
+; 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.
+
 $TTL 	60
 @	IN	SOA	. . 0 0 0 0 0
 @	IN	NS	.
diff --git a/bin/tests/system/rrsetorder/ns4/named.conf b/bin/tests/system/rrsetorder/ns4/named.conf
index 0ee32968633..e7524e999d8 100644
--- a/bin/tests/system/rrsetorder/ns4/named.conf
+++ b/bin/tests/system/rrsetorder/ns4/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007  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
diff --git a/lib/dns/order.c b/lib/dns/order.c
index c91d561e9ac..326b8f93cf1 100644
--- a/lib/dns/order.c
+++ b/lib/dns/order.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@ struct dns_order {
 	ISC_LIST(dns_order_ent_t)	ents;
 	isc_mem_t			*mctx;
 };
-	
+
 #define DNS_ORDER_MAGIC ISC_MAGIC('O','r','d','r')
 #define DNS_ORDER_VALID(order)	ISC_MAGIC_VALID(order, DNS_ORDER_MAGIC)
 
@@ -62,7 +62,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) {
 	order = isc_mem_get(mctx, sizeof(*order));
 	if (order == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	ISC_LIST_INIT(order->ents);
 
 	/* Implicit attach. */
@@ -88,7 +88,7 @@ dns_order_add(dns_order_t *order, dns_name_t *name,
 
 	REQUIRE(DNS_ORDER_VALID(order));
 	REQUIRE(mode == DNS_RDATASETATTR_RANDOMIZE ||
-	        mode == DNS_RDATASETATTR_FIXEDORDER ||
+		mode == DNS_RDATASETATTR_FIXEDORDER ||
 		mode == 0 /* DNS_RDATASETATTR_CYCLIC */ );
 
 	ent = isc_mem_get(order->mctx, sizeof(*ent));
@@ -108,7 +108,7 @@ dns_order_add(dns_order_t *order, dns_name_t *name,
 
 static inline isc_boolean_t
 match(dns_name_t *name1, dns_name_t *name2) {
-	
+
 	if (dns_name_iswildcard(name2))
 		return(dns_name_matcheswildcard(name1, name2));
 	return (dns_name_equal(name1, name2));