update copyright notice
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user