From 2615007d77192bb86316b01e65dfd91864cdce8a Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 25 Jul 2012 23:45:12 +0000 Subject: [PATCH] update copyright notice --- bin/named/query.c | 4 ++-- .../system/dnssec/ns3/expiring.example.db.in | 2 +- bin/tests/system/dnssec/ns4/named3.conf | 2 +- lib/dns/include/dns/rdataset.h | 4 ++-- lib/dns/rdataset.c | 22 +++++++++---------- lib/dns/tests/rdataset_test.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/named/query.c b/bin/named/query.c index 4764e73320..6aae634f88 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -2341,7 +2341,7 @@ 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; @@ -2351,7 +2351,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/ns3/expiring.example.db.in b/bin/tests/system/dnssec/ns3/expiring.example.db.in index d77cca2a7e..2fe7846022 100644 --- 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) 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 057489fe4d..2d407407dc 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 63e434b243..b2b8370db0 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 5524c4336b..026d771235 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 a7bd224f6e..7cbaa1958c 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