update copyright notice

diff --git a/bin/named/query.c b/bin/named/query.c
index e0611e3098ed5d15a4c0a296ba073586c1e56aab..3c8b91b9fddeca9d016c2c6c66d4602732efe9f9 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -2804,8 +2804,8 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
        dns_dbnode_t *node = NULL;
        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;
        dns_clientinfomethods_init(&cm, ns_client_sourceip);
@@ -2817,7 +2817,7 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name,
        result = dns_db_findnodeext(db, name, ISC_TRUE, &cm, &ci, &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/ns3/expired.example.db.in b/bin/tests/system/dnssec/ns3/expired.example.db.in
index d209b804e99971aaac89a1f86363858bf359cccf..02ebc46e023bd2e5034e1e0e171b9615818a5512 100644 (file)
--- a/bin/tests/system/dnssec/ns3/expired.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expired.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 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/bin/tests/system/dnssec/ns3/expiring.example.db.in b/bin/tests/system/dnssec/ns3/expiring.example.db.in
index d77cca2a7e84306eb98a1610eba80f08258cd80c..95edff900dbceb9d2971bfd89e5091ba36802d01 100644 (file)
--- a/bin/tests/system/dnssec/ns3/expiring.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expiring.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 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/bin/tests/system/dnssec/ns4/named3.conf b/bin/tests/system/dnssec/ns4/named3.conf
index 057489fe4dfe0333f2bc41c839d0a6880a3b3a89..2d407407dcafdc0a708a6fcd7f8aa6619178a5d5 100644 (file)
--- 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 ce10cbcbbed06269351a518dc13f89fa2521a63e..31bcd15f1424ec211dd72aac40cfb166c8122bae 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -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 5524c4336b75df625492b8c91d3abd09ff5c71d8..026d771235cc12bafc497ddf6e55b15439db8f7a 100644 (file)
--- 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 a7bd224f6e9754694e47d144a6184c134579678e..7cbaa1958cea2803aad0815ee619c072436f7f06 100644 (file)
--- 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