[master] fixed geoip in blackhole ACLs

3722.	[bug]		Using geoip ACLs in a blackhole statement
			could cause a segfault. [RT #35272]
This commit is contained in:
Evan Hunt
2014-01-30 17:03:32 -08:00
parent 4734976943
commit d0803df331
10 changed files with 72 additions and 5 deletions

View File

@@ -229,5 +229,18 @@ done
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:reloading server"
cp -f ns2/named12.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sleep 3
n=`expr $n + 1`
echo "I:checking GeoIP blackhole ACL"
ret=0
$DIG $DIGOPTS txt example -b 10.53.0.$i > dig.out.ns2.test$n || ret=1
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 status 2>&1 > rndc.out.ns2.test$n || ret=1
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status