mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

When an rdataset is signed, its ttl is normalized based on the signature

Browse Source 
validity period.
This commit is contained in:
Brian Wellington
2000-05-31 22:01:39 +00:00
parent 5416faa397
commit 75f6c57d95
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
218. [func] When an rdataset is signed, its ttl is normalized
based on the signature validity period.
217. [func] Also-notify and trusted-keys can now be used in a 217. [func] Also-notify and trusted-keys can now be used in a
config file. config file.

13
lib/dns/resolver.c
View File

@@ -2448,14 +2448,19 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
} }
} }
/*
* Normalize the rdataset and sigrdataset TTLs.
*/
if (sigrdataset != NULL) {
rdataset->ttl = ISC_MIN(rdataset->ttl,
sigrdataset->ttl);
sigrdataset->ttl = rdataset->ttl;
}
/* /*
* Cache this rdataset/sigrdataset pair as * Cache this rdataset/sigrdataset pair as
* pending data. * pending data.
*/ */
#ifdef notyet
if (sigrdataset != NULL)
set_ttl(rdataset, sigrdataset);
#endif
rdataset->trust = dns_trust_pending; rdataset->trust = dns_trust_pending;
if (sigrdataset != NULL) if (sigrdataset != NULL)
sigrdataset->trust = dns_trust_pending; sigrdataset->trust = dns_trust_pending;

13
lib/dns/validator.c
View File

@@ -864,6 +864,19 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
validator_log(val, ISC_LOG_DEBUG(3), validator_log(val, ISC_LOG_DEBUG(3),
"failed to verify rdataset"); "failed to verify rdataset");
else {
isc_uint32_t ttl;
isc_stdtime_t now;
isc_stdtime_get(&now);
ttl = ISC_MIN(event->rdataset->ttl,
val->siginfo->timeexpire - now);
if (val->keyset != NULL)
ttl = ISC_MIN(ttl, val->keyset->ttl);
event->rdataset->ttl = ttl;
event->sigrdataset->ttl = ttl;
}
if (val->keynode != NULL) if (val->keynode != NULL)
dns_keytable_detachkeynode(val->keytable, dns_keytable_detachkeynode(val->keytable,
&val->keynode); &val->keynode);