]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix message section checked in a TTL capping test
authorMichał Kępień <michal@isc.org>
Mon, 11 Mar 2019 11:04:42 +0000 (12:04 +0100)
committerMichał Kępień <michal@isc.org>
Mon, 11 Mar 2019 11:11:58 +0000 (12:11 +0100)
Commit c032c54dda2d75c0ec68017e1331bc9880c03ae1 inadvertently changed
the DNS message section inspected by one of the TTL capping checks from
ADDITIONAL to ANSWER, introducing a discrepancy between that check's
description and its actual meaning.  Revert to inspecting the ADDITIONAL
section in the aforementioned check.

(cherry picked from commit a597bd52a68b76988f6ff78d18ae2368b077d32e)

bin/tests/system/dnssec/tests.sh

index 28dff275067b9a9e0de06de8f394b4bffbb68046..aedcf879f12d0e1cb547cd21c7f58b1cbf6d44e4 100644 (file)
@@ -2880,8 +2880,8 @@ status=$((status+ret))
 echo_i "testing TTL is capped at RRSIG expiry time for records in the additional section with dnssec-accept-expired yes; ($n)"
 ret=0
 rndccmd 10.53.0.4 flush 2>&1 | sed 's/^/ns4 /' | cat_i
-dig_with_answeropts +cd expiring.example mx @10.53.0.4 > dig.out.ns4.1.$n
-dig_with_answeropts expiring.example mx @10.53.0.4 > dig.out.ns4.2.$n
+dig_with_additionalopts +cd expiring.example mx @10.53.0.4 > dig.out.ns4.1.$n
+dig_with_additionalopts expiring.example mx @10.53.0.4 > dig.out.ns4.2.$n
 ttls=$(awk '$1 != ";;" {print $2}' dig.out.ns4.1.$n)
 ttls2=$(awk '$1 != ";;" {print $2}' dig.out.ns4.2.$n)
 for ttl in ${ttls:-300}; do