- cache-max-ttl also defines upperbound of initial TTL in response.

git-svn-id: file:///svn/unbound/trunk@5007 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 55ea5246ee11c294c6749d368af445802302d5ab..6b5b32f0b0955e36fb2a186eb4286d673fd39188 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 3 December 2018: Wouter
        - Fix icon, no ragged edges and nicer resolutions available, for eg.
          Win 7 and Windows 10 display.
+       - cache-max-ttl also defines upperbound of initial TTL in response.
 
 30 November 2018: Wouter
        - Patch for typo in unbound.conf man page.

diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 6e5cd7c4de73dc2f46e70f09a2eed57bd1201fab..32aec4bf4c959161babc5fd04df7ebac7d9b04f3 100644 (file)
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -195,6 +195,8 @@ rdata_copy(sldns_buffer* pkt, struct packed_rrset_data* data, uint8_t* to,
        }
        if(*rr_ttl < MIN_TTL)
                *rr_ttl = MIN_TTL;
+       if(*rr_ttl > MAX_TTL)
+               *rr_ttl = MAX_TTL;
        if(*rr_ttl < data->ttl)
                data->ttl = *rr_ttl;