- Fix that auth-zone zonefiles use last TTL if no TTL is specified.

diff --git a/doc/Changelog b/doc/Changelog
index ac3a9c390bcafeee0b8d3553e01c07174547db22..aaa1561e03605195aa1306e8ee2af4584ab19620 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+12 May 2021: Wouter
+       - Fix that auth-zone zonefiles use last TTL if no TTL is specified.
+
 10 May 2021: Wouter
        - Merge PR #487: ifdef RLIMIT_AS in recently added check.
 

diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index 70eec6dabcedd3e822fcb1c0713a88e3a982c03c..401625728b963fbedecf3b1c9f2e224f3b94995d 100644 (file)
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -929,6 +929,10 @@ int sldns_fp2wire_rr_buf(FILE* in, uint8_t* rr, size_t* len, size_t* dname_len,
                        memmove(parse_state->prev_rr, rr, *dname_len);
                        parse_state->prev_rr_len = (*dname_len);
                }
+               if(r == LDNS_WIREPARSE_ERR_OK && parse_state) {
+                       parse_state->default_ttl = sldns_wirerr_get_ttl(
+                               rr, *len, *dname_len);
+               }
                return r;
        }
        return LDNS_WIREPARSE_ERR_OK;