upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 07:41:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take configured minimum TTL into consideration when reducing TTL to original

Browse source 
TTL from RRSIG.


git-svn-id: file:///svn/unbound/trunk@3849 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans 2016-09-05 12:30:46 +00:00
parent 1508a5bb2c
commit 19ebdbf6a6
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
5 September 2016: Ralph
- Take configured minimum TTL into consideration when reducing TTL
to original TTL from RRSIG.
5 September 2016: Wouter 5 September 2016: Wouter
- Fix #829: doc of sldns_wire2str_rdata_buf() return value has an - Fix #829: doc of sldns_wire2str_rdata_buf() return value has an
off-by-one typo, from Jinmei Tatuya (Infoblox). off-by-one typo, from Jinmei Tatuya (Infoblox).

14
validator/val_sigcrypt.c
View file

@ -1283,15 +1283,23 @@ adjust_ttl(struct val_env* ve, uint32_t unow,
/* so now: /* so now:
* d->ttl: rrset ttl read from message or cache. May be reduced * d->ttl: rrset ttl read from message or cache. May be reduced
* origttl: original TTL from signature, authoritative TTL max. * origttl: original TTL from signature, authoritative TTL max.
* MIN_TTL: minimum TTL from config.
* expittl: TTL until the signature expires. * expittl: TTL until the signature expires.
* *
* Use the smallest of these. * Use the smallest of these, but don't let origttl set the TTL
* below the minimum.
*/ */
if(d->ttl > (time_t)origttl) { if(MIN_TTL > (time_t)origttl && d->ttl > MIN_TTL) {
verbose(VERB_QUERY, "rrset TTL larger than original and minimum"
" TTL, adjusting TTL downwards to mimimum ttl");
d->ttl = MIN_TTL;
}
else if(MIN_TTL <= origttl && d->ttl > (time_t)origttl) {
verbose(VERB_QUERY, "rrset TTL larger than original TTL, " verbose(VERB_QUERY, "rrset TTL larger than original TTL, "
" adjusting TTL downwards"); "adjusting TTL downwards to original ttl");
d->ttl = origttl; d->ttl = origttl;
} }
if(expittl > 0 && d->ttl > (time_t)expittl) { if(expittl > 0 && d->ttl > (time_t)expittl) {
verbose(VERB_ALGO, "rrset TTL larger than sig expiration ttl," verbose(VERB_ALGO, "rrset TTL larger than sig expiration ttl,"
" adjusting TTL downwards"); " adjusting TTL downwards");