mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

call zone_settimer; sub test failure was not being detected

Browse Source 
(cherry picked from commit ebd7900670)
This commit is contained in:
Mark Andrews
2013-09-18 12:57:25 +10:00
parent 3b84724c44
commit 7667dd1a03
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/dnssec/tests.sh
View File

@@ -2327,6 +2327,7 @@ if test $ret != 0 ; then echo "I:failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
echo "I:check that increasing the sig-validity-interval resigning triggers re-signing" echo "I:check that increasing the sig-validity-interval resigning triggers re-signing"
ret=0
before=`$DIG axfr siginterval.example -p 5300 @10.53.0.3 | grep RRSIG.SOA` before=`$DIG axfr siginterval.example -p 5300 @10.53.0.3 | grep RRSIG.SOA`
cp ns3/siginterval2.conf ns3/siginterval.conf cp ns3/siginterval2.conf ns3/siginterval.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reconfig 2>&1 | sed 's/^/I:ns3 /' $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reconfig 2>&1 | sed 's/^/I:ns3 /'
@@ -2337,7 +2338,7 @@ test "$before" != "$after" && break
sleep 1 sleep 1
done done
n=`expr $n + 1` n=`expr $n + 1`
if test "$before" = "$after" ; then echo "I:failed"; fi if test "$before" = "$after" ; then echo "I:failed"; ret=1; fi
status=`expr $status + $ret` status=`expr $status + $ret`
echo "I:exit status: $status" echo "I:exit status: $status"

6
lib/dns/zone.c
View File

@@ -14079,11 +14079,17 @@ dns_zone_getsigvalidityinterval(dns_zone_t *zone) {
void void
dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval) { dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval) {
isc_time_t now;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
LOCK_ZONE(zone); LOCK_ZONE(zone);
zone->sigresigninginterval = interval; zone->sigresigninginterval = interval;
set_resigntime(zone); set_resigntime(zone);
if (zone->task != NULL) {
TIME_NOW(&now);
zone_settimer(zone, &now);
}
UNLOCK_ZONE(zone); UNLOCK_ZONE(zone);
} }