From: Tinderbox User <tbox@isc.org>
Date: Wed, 25 Jul 2012 23:45:25 +0000 (+0000)
Subject: update copyright notice
X-Git-Tag: v9.7.7rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7132f5d13ca2065165873a7856b35dd66fc531e;p=thirdparty%2Fbind9.git

update copyright notice
---

diff --git a/bin/named/query.c b/bin/named/query.c
index 9816d46ab50..9cb5e12c528 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -2360,8 +2360,8 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
 
 	dns_clientinfomethods_t cm;
 	dns_clientinfo_t ci;
-	isc_stdtime_t now;	
-	
+	isc_stdtime_t now;
+
 	rdataset->trust = dns_trust_secure;
 	sigrdataset->trust = dns_trust_secure;
 
@@ -2371,7 +2371,7 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
 	result = dns_db_findnode(db, name, ISC_TRUE, &node);
 	if (result != ISC_R_SUCCESS)
 		return;
-		
+
 	isc_stdtime_get(&now);
 	dns_rdataset_trimttl(rdataset, sigrdataset, rrsig, now,
 			     client->view->acceptexpired);
diff --git a/bin/tests/system/dnssec/ns4/named3.conf b/bin/tests/system/dnssec/ns4/named3.conf
index 057489fe4df..2d407407dca 100644
--- a/bin/tests/system/dnssec/ns4/named3.conf
+++ b/bin/tests/system/dnssec/ns4/named3.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012  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/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index d01b5e9d522..47d119a58e3 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -654,8 +654,8 @@ dns_rdataset_expire(dns_rdataset_t *rdataset);
 
 void
 dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
-                     dns_rdata_rrsig_t *rrsig, isc_stdtime_t now,
-                     isc_boolean_t acceptexpired);
+		     dns_rdata_rrsig_t *rrsig, isc_stdtime_t now,
+		     isc_boolean_t acceptexpired);
 /*%<
  * Trim the ttl of 'rdataset' and 'sigrdataset' so that they will expire
  * at or before 'rrsig->expiretime'.  If 'acceptexpired' is true and the
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 5524c4336b7..026d771235c 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -788,15 +788,15 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
 	/*
 	 * If we accept expired RRsets keep them for no more than 120 seconds.
 	 */
-        if (acceptexpired &&
-            (isc_serial_le(rrsig->timeexpire, ((now + 120) & 0xffffffff)) ||
-             isc_serial_le(rrsig->timeexpire, now)))
-                ttl = 120;
-        else if (isc_serial_ge(rrsig->timeexpire, now))
-                ttl = rrsig->timeexpire - now;
-	
-        ttl = ISC_MIN(ISC_MIN(rdataset->ttl, sigrdataset->ttl),
-                      ISC_MIN(rrsig->originalttl, ttl));
-        rdataset->ttl = ttl;
-        sigrdataset->ttl = ttl;
+	if (acceptexpired &&
+	    (isc_serial_le(rrsig->timeexpire, ((now + 120) & 0xffffffff)) ||
+	     isc_serial_le(rrsig->timeexpire, now)))
+		ttl = 120;
+	else if (isc_serial_ge(rrsig->timeexpire, now))
+		ttl = rrsig->timeexpire - now;
+
+	ttl = ISC_MIN(ISC_MIN(rdataset->ttl, sigrdataset->ttl),
+		      ISC_MIN(rrsig->originalttl, ttl));
+	rdataset->ttl = ttl;
+	sigrdataset->ttl = ttl;
 }
diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c
index a7bd224f6e9..7cbaa1958ce 100644
--- a/lib/dns/tests/rdataset_test.c
+++ b/lib/dns/tests/rdataset_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012  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