- Feedback for PR #407.

diff --git a/services/localzone.c b/services/localzone.c
index 00067705edbf5c853d1ed2d01b703d75df8aec2b..4369e23c1316840f090efbb6f21ba0811c63aeca 100644 (file)
--- 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 2b17c8433581db4a8faced140b8ee81ff2508542..9c5ecbb1c8bac842c488d6be6c9d1d4f2e198eb3 100644 (file)
--- 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"