From: Tinderbox User <tbox@isc.org>
Date: Thu, 10 Apr 2014 23:46:10 +0000 (+0000)
Subject: update copyright notice
X-Git-Tag: v9.10.0rc2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7051299c60cbaac13d62d35038460507459e140;p=thirdparty%2Fbind9.git

update copyright notice
---

diff --git a/bin/dnssec/dnssec-importkey.8 b/bin/dnssec/dnssec-importkey.8
index 7b51956d717..bc33ce6c3db 100644
--- a/bin/dnssec/dnssec-importkey.8
+++ b/bin/dnssec/dnssec-importkey.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2013, 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
diff --git a/bin/dnssec/dnssec-importkey.html b/bin/dnssec/dnssec-importkey.html
index 3b1c922acb7..024f05115b1 100644
--- a/bin/dnssec/dnssec-importkey.html
+++ b/bin/dnssec/dnssec-importkey.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013, 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
diff --git a/contrib/perftcpdns/Makefile.in b/contrib/perftcpdns/Makefile.in
index 96b8019a7e4..9c5bb126b25 100644
--- a/contrib/perftcpdns/Makefile.in
+++ b/contrib/perftcpdns/Makefile.in
@@ -1,4 +1,16 @@
 # 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.
 
 CC = @CC@
 LIBOBJS = @LIBOBJS@
diff --git a/contrib/perftcpdns/configure.in b/contrib/perftcpdns/configure.in
index 62ee7a736c3..4da245ecd54 100644
--- a/contrib/perftcpdns/configure.in
+++ b/contrib/perftcpdns/configure.in
@@ -1,18 +1,16 @@
 # Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# 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 INTERNET SOFTWARE CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SOFTWARE CONSORTIUM 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.
-#
+# 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.
 
 AC_INIT(perftcpdns.c)
 
diff --git a/contrib/perftcpdns/perftcpdns.c b/contrib/perftcpdns/perftcpdns.c
index b5730dbf22e..f545b5c6686 100644
--- a/contrib/perftcpdns/perftcpdns.c
+++ b/contrib/perftcpdns/perftcpdns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 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
@@ -701,7 +701,7 @@ sendquery(struct exchange *x)
 	if ((size_t) ret == length_query + off)
 		return 0;
 	return -errno;
-}	
+}
 
 /*
  * poll ready and send
@@ -1562,7 +1562,7 @@ getserveraddr(const int flags)
 		hints.ai_protocol = IPPROTO_TCP;
 	}
 	hints.ai_flags = AI_ADDRCONFIG | flags;
-	
+
 	ret = getaddrinfo(servername, NULL, &hints, &res);
 	if (ret != 0) {
 		fprintf(stderr, "bad server=%s: %s\n",
@@ -1604,7 +1604,7 @@ getlocaladdr(void)
 		hints.ai_protocol = IPPROTO_TCP;
 	}
 	hints.ai_flags = AI_ADDRCONFIG;
-	
+
 	ret = getaddrinfo(localname, NULL, &hints, &res);
 	if (ret != 0) {
 		fprintf(stderr,
@@ -2438,7 +2438,7 @@ main(const int argc, char * const argv[])
 	/* round-time trip statistics */
 	if (xrcount != 0) {
 		double avg, stddev;
-		
+
 		avg = dsum / xrcount;
 		stddev = sqrt(dsumsq / xrcount - avg * avg);
 		printf("RTT: min/avg/max/stddev:  %.3f/%.3f/%.3f/%.3f ms\n",