update copyright notice

2025-08-31 06:25:31 +00:00 · 2011-10-27 23:46:31 +00:00
parent bea3208b41
commit 96f5a19c12
7 changed files with 22 additions and 26 deletions
--- a/bin/tests/system/edns/clean.sh
+++ b/bin/tests/system/edns/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: clean.sh,v 1.2 2011/10/27 20:18:41 smann Exp $
+# $Id: clean.sh,v 1.3 2011/10/27 23:46:30 tbox Exp $

 #
 # Clean up after zone transfer tests.
--- a/bin/tests/system/edns/ns1/named.conf
+++ b/bin/tests/system/edns/ns1/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 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
@@ -15,7 +14,7 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.2 2011/10/27 20:18:41 smann Exp $ */
+/* $Id: named.conf,v 1.3 2011/10/27 23:46:31 tbox Exp $ */

 key rndc_key {
        secret "1234abcd8765";
--- a/bin/tests/system/edns/setup.sh
+++ b/bin/tests/system/edns/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 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
@@ -15,5 +14,5 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.2 2011/10/27 20:18:41 smann Exp $
+# $Id: setup.sh,v 1.3 2011/10/27 23:46:30 tbox Exp $

--- a/bin/tests/system/edns/tests.sh
+++ b/bin/tests/system/edns/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: tests.sh,v 1.2 2011/10/27 20:18:41 smann Exp $ 
+# $Id: tests.sh,v 1.3 2011/10/27 23:46:30 tbox Exp $ 

 # ns1 = forward only server
 # ans2 = modified ans.pl master
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: adb.c,v 1.260 2011/10/27 22:23:58 marka Exp $ */
+/* $Id: adb.c,v 1.261 2011/10/27 23:46:31 tbox Exp $ */

 /*! \file
 *
@@ -288,7 +288,7 @@ struct dns_adbentry {
 	 *                   DNS_FETCHOPT_NOEDNS0, DNS_FETCHOPT_EDNS512 or
 	 *		     0 meaning use DNS_ADB_EDNS0_MAX_LEN)
 	 * edns_drop_count - keeps count of the number of times EDNS udpsize
-	 *		     was dropped - reset to 0 every 
+	 *		     was dropped - reset to 0 every
 	 *		     DNS_ADB_EDNS_RESET_TIME
 	 * edns_drop_timestamp - The time at which the first EDNS drop
 	 *			 in packet size was recorded
@@ -3993,7 +3993,7 @@ dns_adb_getednsflag(dns_adb_t *adb, dns_adbaddrinfo_t *addr, isc_stdtime_t now)
 		addr->entry->edns_fetch_flag = flag_to_use;
 		addr->entry->edns_expires_timestamp = 0;
 		addr->entry->edns_timer_set = isc_boolean_false;
-	
+
 	}

 	flag_to_use = addr->entry->edns_fetch_flag;
@@ -4070,7 +4070,7 @@ dns_adb_dropednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 	 * This function keeps a count of the number of times
 	 * within DNS_ADB_EDNS_RESET_TIME that a particular server
 	 * has dropped the udpsize in order to communicate with the
-	 * server. If the number of times this occurs exceeds 
+	 * server. If the number of times this occurs exceeds
 	 * DNS_ADB_EDNS_MAX_DROP_COUNT, then the udpsize is reduced
 	 * by way of edns_fetch_flag for DNS_ADB_EDNS_MAX_DROP_TIME,
 	 * after which the largest size is retried again.
@@ -4080,7 +4080,7 @@ dns_adb_dropednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 	if (length > length_to_use)
 		length_to_use = length;

-	if((now - addr->entry->edns_drop_timestamp) >= 
+	if((now - addr->entry->edns_drop_timestamp) >=
 			DNS_ADB_EDNS_RESET_TIME) {

 		drop_counter_to_use = 1;
@@ -4101,11 +4101,11 @@ dns_adb_dropednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 				 * do so now. After DNS_ADB_EDNS_MAX_DROP_TIME,
 				 * we'll go back to the largest size
 				 */
-				expires_ts_to_use = 
+				expires_ts_to_use =
 					now + DNS_ADB_EDNS_MAX_DROP_TIME;
 				timer_setting_to_use = isc_boolean_true;
 			}
-			
+
 			if(length == 0)
 				flag_to_use = DNS_FETCHOPT_NOEDNS0;
 			else /* eventually, more edns sizes here */
@@ -4121,7 +4121,7 @@ dns_adb_dropednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 	addr->entry->edns_fetch_flag = flag_to_use;
 	addr->entry->edns_expires_timestamp = expires_ts_to_use;
 	addr->entry->edns_timer_set = timer_setting_to_use;
-	
+
 	UNLOCK(&adb->entrylocks[bucket]);
 }

--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 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: adb.h,v 1.86 2011/10/27 20:18:42 smann Exp $ */
+/* $Id: adb.h,v 1.87 2011/10/27 23:46:31 tbox Exp $ */

 #ifndef DNS_ADB_H
 #define DNS_ADB_H 1
@@ -587,7 +587,7 @@ dns_adb_setednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,

 void
 dns_adb_dropednssize(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
-                    unsigned int length, isc_stdtime_t now);
+		    unsigned int length, isc_stdtime_t now);
 /*%
 * Drop the EDNS size
 *
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: resolver.c,v 1.436 2011/10/27 20:18:42 smann Exp $ */
+/* $Id: resolver.c,v 1.437 2011/10/27 23:46:31 tbox Exp $ */

 /*! \file */

@@ -1795,7 +1795,7 @@ resquery_send(resquery_t *query) {
 	isc_netaddr_fromsockaddr(&ipaddr, &query->addrinfo->sockaddr);
 	(void) dns_peerlist_peerbyaddr(fctx->res->view->peers, &ipaddr, &peer);

-	/* 
+	/*
 	 * Get the fetchopt flag for this server from the adb cache
 	 * NOTE: if the NOEDNS flag has been set on addrinfo->flags,
 	 *       it will over write this below.
@@ -1850,7 +1850,7 @@ resquery_send(resquery_t *query) {
 			query->options |= DNS_FETCHOPT_EDNS512;
 			if (edns_fetchopt_flag != DNS_FETCHOPT_EDNS512) {
 				dns_adb_dropednssize(fctx->adb, query->addrinfo,
-					    	    512, now);
+						    512, now);
 				fctx->reason = "reducing the advertised EDNS "
 					       "UDP packet size to 512 octets";
 			} else