ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

rndc reconfig reports configuration errors the same way rndc reload does [RT #39635]

Browse Source
This commit is contained in:
Witold Krecicki
2015-06-12 10:19:29 +02:00
parent a8cb6c6fbc
commit af3770ed93
5 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/tests/system/rndc/tests.sh
View File

@@ -411,4 +411,19 @@ grep "ISC_R_SUCCESS 0" rndc.output > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:test 'rndc reconfig' with a broken config"
ret=0
$RNDC -s 10.53.0.4 -p 9956 -c ns4/key6.conf reconfig > /dev/null || ret=1
sleep 1
mv ns4/named.conf ns4/named.conf.save
echo "error error error" >> ns4/named.conf
$RNDC -s 10.53.0.4 -p 9956 -c ns4/key6.conf reconfig > rndc.output 2>&1 && ret=1
grep "rndc: 'reconfig' failed: unexpected token" rndc.output > /dev/null || ret=1
mv ns4/named.conf.save ns4/named.conf
sleep 1
$RNDC -s 10.53.0.4 -p 9956 -c ns4/key6.conf reconfig > /dev/null || ret=1
sleep 1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
exit $status