From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 19 Jan 2021 19:09:34 +0000 (+0100)
Subject: - Feedback for PR #407.
X-Git-Tag: release-1.13.1rc1~13^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e12229b8e6cd5c6b45c61851574492af5a2fa6;p=thirdparty%2Funbound.git

- Feedback for PR #407.
---

diff --git a/services/localzone.c b/services/localzone.c
index 00067705e..4369e23c1 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -494,12 +494,12 @@ lz_mark_soa_for_zone(struct local_zone* z, struct ub_packed_rrset_key* soa_rrset
 	if(!rrset_insert_rr(z->region, pd, rdata, rdata_len, ttl, rrstr))
 		return 0;
 	/* last 4 bytes are minimum ttl in network format */
-	if(pd->count == 0 || pd->rr_len[0] < 2+4) {
+	if(pd->count == 0 || pd->rr_len[0] < 2+4)
 		return 0;
-	}
 	minimum = (time_t)sldns_read_uint32(pd->rr_data[0]+(pd->rr_len[0]-4));
-	pd->ttl = ttl<minimum?ttl:minimum;
-	pd->rr_ttl[0] = pd->ttl;
+	minimum = ttl<minimum?ttl:minimum;
+	pd->ttl = minimum;
+	pd->rr_ttl[0] = minimum;
 
 	z->soa_negative = rrset_negative;
 	return 1;
diff --git a/testdata/auth_zonefile_down.rpl b/testdata/auth_zonefile_down.rpl
index 2b17c8433..9c5ecbb1c 100644
--- a/testdata/auth_zonefile_down.rpl
+++ b/testdata/auth_zonefile_down.rpl
@@ -1,7 +1,7 @@
 ; config options
 server:
 	target-fetch-policy: "0 0 0 0 0"
-	; Options for singed zone. The zone is partially copied from val_negcache_nxdomain.rpl
+	; Options for signed zone. The zone is partially copied from val_negcache_nxdomain.rpl
 	trust-anchor: "testzone.nlnetlabs.nl.	IN	DS	2926 8 2 6f8512d1e82eecbd684fc4a76f39f8c5b411af385494873bdead663ddb78a88b"
 	val-override-date: "20180213111425"
 	qname-minimisation: "no"