update copyright notice

bin/dnssec/dnssec-keyfromlabel.docbook

@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008-2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2011  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keyfromlabel.docbook,v 1.19 2011/02/03 12:01:44 marka Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.20 2011/02/03 12:18:10 tbox Exp $ -->
 <refentry id="man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
@@ -39,6 +39,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

bin/named/config.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.114 2011/02/03 05:41:52 marka Exp $ */
+/* $Id: config.c,v 1.115 2011/02/03 12:18:10 tbox Exp $ */
 
 /*! \file */
 

bin/named/server.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.601 2011/02/03 05:41:52 marka Exp $ */
+/* $Id: server.c,v 1.602 2011/02/03 12:18:10 tbox Exp $ */
 
 /*! \file */
 
@@ -2206,7 +2206,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
 	if (lame_ttl > 1800)
 		lame_ttl = 1800;
 	dns_resolver_setlamettl(view->resolver, lame_ttl);
-	
+
 	/*
 	 * Set the resolver's query timeout.
 	 */

bin/named/update.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.187 2011/02/03 06:03:15 marka Exp $ */
+/* $Id: update.c,v 1.188 2011/02/03 12:18:10 tbox Exp $ */
 
 #include <config.h>
 
@@ -3436,7 +3436,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 	 */
 	for (tuple = ISC_LIST_HEAD(diff->tuples);
 	     tuple != NULL; tuple = next) {
-	
+
 		next = ISC_LIST_NEXT(tuple, link);
 
 		if (tuple->rdata.type != dns_rdatatype_dnskey)
@@ -3500,7 +3500,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 	     tuple = ISC_LIST_HEAD(temp_diff.tuples)) {
 
 		ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
-                ISC_LIST_APPEND(diff->tuples, tuple, link);
+		ISC_LIST_APPEND(diff->tuples, tuple, link);
 
 		dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL);
 		if ((dnskey.flags &

bin/rndc/rndc.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.132 2011/02/03 11:46:17 marka Exp $ */
+/* $Id: rndc.c,v 1.133 2011/02/03 12:18:10 tbox Exp $ */
 
 /*! \file */
 

bin/tests/resolver/Makefile.in

-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1999-2002  Internet Software Consortium.
+# Copyright (C) 2011  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.
 #
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2011/02/03 05:41:53 marka Exp $
+# $Id: Makefile.in,v 1.3 2011/02/03 12:18:10 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@

bin/tests/resolver/t_resolver.c

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_resolver.c,v 1.2 2011/02/03 05:41:53 marka Exp $ */
+/* $Id: t_resolver.c,v 1.3 2011/02/03 12:18:11 tbox Exp $ */
 
 #include <config.h>
 
@@ -52,7 +52,7 @@ setup_create_dispatch_v4(void)
 {
 	isc_sockaddr_t local_address;
 	isc_sockaddr_any(&local_address);
-	
+
 	CHECK(dns_dispatch_getudp(dispatch_manager, socket_manager, task_manager,
 				  &local_address, 4096, 100, 100, 100, 500,
 				  0, 0, /* unsigned int attributes, unsigned int mask, */
@@ -83,7 +83,7 @@ teardown(void) {
 static isc_result_t
 make_resolver(dns_resolver_t **resolverp) {
 	isc_result_t result;
-	
+
 	result = dns_resolver_create(view,
 			    task_manager, 1,
 			    socket_manager,
@@ -128,7 +128,7 @@ test_dns_resolver_gettimeout(void) {
 		 "The default timeout is returned from _gettimeout()");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", timeout, (timeout == 1 ? "" : "s"));
 	test_result = (timeout > 0) ? T_PASS : T_FAIL;
@@ -149,7 +149,7 @@ test_dns_resolver_settimeout(void) {
 		 "_settimeout() can change the timeout to a non-default");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	default_timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", default_timeout,
 	       (default_timeout == 1 ? "" : "s"));
@@ -162,7 +162,7 @@ test_dns_resolver_settimeout(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 
@@ -177,7 +177,7 @@ test_dns_resolver_settimeout_to_default(void) {
 		 " by specifying 0 as the timeout.");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	default_timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", default_timeout,
 	       (default_timeout == 1 ? "" : "s"));
@@ -193,7 +193,7 @@ test_dns_resolver_settimeout_to_default(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 
@@ -207,7 +207,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
 		 "_settimeout() cannot set the value larger than the maximum.");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	dns_resolver_settimeout(resolver, 4000000);
 	timeout = dns_resolver_gettimeout(resolver);
 	t_info("The new timeout is %d second%s\n", timeout,
@@ -217,7 +217,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 

bin/tests/system/dns64/ns1/example.db

-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.4 2011/02/03 07:35:55 marka Exp $
+; $Id: example.db,v 1.5 2011/02/03 12:18:11 tbox Exp $
 
 $TTL	3600
 @	SOA ns1 marka.isc.org. 0 0 0 0 1200

bin/tests/system/nsupdate/clean.sh

 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.21 2011/02/03 06:03:15 marka Exp $
+# $Id: clean.sh,v 1.22 2011/02/03 12:18:11 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

bin/tests/system/nsupdate/ns3/named.conf

 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2011/02/03 06:03:15 marka Exp $ */
+/* $Id: named.conf,v 1.5 2011/02/03 12:18:11 tbox Exp $ */
 
 // NS1
 

bin/tests/system/nsupdate/ns3/sign.sh

 #!/bin/sh -e
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.3 2011/02/03 06:03:15 marka Exp $
+# $Id: sign.sh,v 1.4 2011/02/03 12:18:11 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

bin/tests/system/nsupdate/tests.sh

 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.33 2011/02/03 06:03:15 marka Exp $
+# $Id: tests.sh,v 1.34 2011/02/03 12:18:11 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

lib/dns/dispatch.c

 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.169 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: dispatch.c,v 1.170 2011/02/03 12:18:11 tbox Exp $ */
 
 /*! \file */
 

lib/dns/include/dns/resolver.h

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.68 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: resolver.h,v 1.69 2011/02/03 12:18:11 tbox Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1

lib/dns/ncache.c

 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.51 2011/02/03 07:35:56 marka Exp $ */
+/* $Id: ncache.c,v 1.52 2011/02/03 12:18:11 tbox Exp $ */
 
 /*! \file */
 

lib/dns/rdataslab.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.53 2011/02/03 07:35:56 marka Exp $ */
+/* $Id: rdataslab.c,v 1.54 2011/02/03 12:18:11 tbox Exp $ */
 
 /*! \file */
 
@@ -150,7 +150,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 	if (nalloc > 0xffff)
 		return (ISC_R_NOSPACE);
 
-	
+
 	if (nalloc != 0) {
 		x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata));
 		if (x == NULL)

lib/dns/resolver.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.429 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: resolver.c,v 1.430 2011/02/03 12:18:11 tbox Exp $ */
 
 /*! \file */
 
@@ -8735,18 +8735,18 @@ dns_resolver_getoptions(dns_resolver_t *resolver) {
 unsigned int
 dns_resolver_gettimeout(dns_resolver_t *resolver) {
 	REQUIRE(VALID_RESOLVER(resolver));
-	
+
 	return (resolver->query_timeout);
 }
 
 void
 dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int seconds) {
 	REQUIRE(VALID_RESOLVER(resolver));
-	
+
 	if (seconds == 0)
 		seconds = DEFAULT_QUERY_TIMEOUT;
 	if (seconds > MAXIMUM_QUERY_TIMEOUT)
 		seconds = MAXIMUM_QUERY_TIMEOUT;
-	
+
 	resolver->query_timeout = seconds;
 }

lib/isc/include/isc/task.h

 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.70 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: task.h,v 1.71 2011/02/03 12:18:12 tbox Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1

lib/isc/task.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.116 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: task.c,v 1.117 2011/02/03 12:18:12 tbox Exp $ */
 
 /*! \file
  * \author Principal Author: Bob Halley

lib/isc/timer.c

 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.96 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: timer.c,v 1.97 2011/02/03 12:18:12 tbox Exp $ */
 
 /*! \file */
 

lib/isc/unix/socket.c

 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.334 2011/02/03 05:41:54 marka Exp $ */
+/* $Id: socket.c,v 1.335 2011/02/03 12:18:12 tbox Exp $ */
 
 /*! \file */
 

lib/isc/win32/include/isc/ipv6.h

 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.20 2011/02/03 08:13:51 marka Exp $ */
+/* $Id: ipv6.h,v 1.21 2011/02/03 12:18:12 tbox Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1