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

Ensure use of "echo_i" where possible

Browse Source 
In many instances 'echo "I:' construct was used where echo_i function
should have been.
This commit is contained in:
Michal Nowak
2020-10-15 16:27:30 +02:00
parent 216273c73b
commit 47862fc559
21 changed files with 142 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
bin/tests/system/tkey/tests.sh
View File

@@ -15,92 +15,101 @@ SYSTEMTESTTOP=..
DIGOPTS="@10.53.0.1 -p 5300"
status=0
n=1
echo "I:generating new DH key"
echo_i "generating new DH key ($n)"
ret=0
dhkeyname=`$KEYGEN -T KEY -a DH -b 768 -n host client` || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
echo_i "failed"
status=$((status+ret))
echo_i "exit status: $status"
exit $status
fi
status=`expr $status + $ret`
n=$((n+1))
for owner in . foo.example.
do
echo "I:creating new key using owner name \"$owner\""
echo_i "creating new key using owner name \"$owner\" ($n)"
ret=0
keyname=`$KEYCREATE $dhkeyname $owner` || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
echo_i "failed"
status=$((status+ret))
echo_i "exit status: $status"
exit $status
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:checking the new key"
echo_i "checking the new key ($n)"
ret=0
$DIG $DIGOPTS txt txt.example -k $keyname > dig.out.1 || ret=1
grep "status: NOERROR" dig.out.1 > /dev/null || ret=1
grep "TSIG.*hmac-md5.*NOERROR" dig.out.1 > /dev/null || ret=1
grep "Some TSIG could not be validated" dig.out.1 > /dev/null && ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:deleting new key"
echo_i "deleting new key ($n)"
ret=0
$KEYDELETE $keyname || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:checking that new key has been deleted"
echo_i "checking that new key has been deleted ($n)"
ret=0
$DIG $DIGOPTS txt txt.example -k $keyname > dig.out.2 || ret=1
grep "status: NOERROR" dig.out.2 > /dev/null && ret=1
grep "TSIG.*hmac-md5.*NOERROR" dig.out.2 > /dev/null && ret=1
grep "Some TSIG could not be validated" dig.out.2 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
done
echo "I:creating new key using owner name bar.example."
echo_i "creating new key using owner name bar.example. ($n)"
ret=0
keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
echo_i "failed"
status=$((status+ret))
echo_i "exit status: $status"
exit $status
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:checking the key with 'rndc tsig-list'"
echo_i "checking the key with 'rndc tsig-list' ($n)"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.1
grep "key \"bar.example.server" rndc.out.1 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:using key in a request"
echo_i "using key in a request ($n)"
ret=0
$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.3 || ret=1
grep "status: NOERROR" dig.out.3 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:deleting the key with 'rndc tsig-delete'"
echo_i "deleting the key with 'rndc tsig-delete' ($n)"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-delete bar.example.server > /dev/null || ret=1
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.2
@@ -108,38 +117,42 @@ grep "key \"bar.example.server" rndc.out.2 > /dev/null && ret=1
$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.4 || ret=1
grep "TSIG could not be validated" dig.out.4 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:recreating the bar.example. key"
echo_i "recreating the bar.example. key ($n)"
ret=0
keyname=`$KEYCREATE $dhkeyname bar.example.` || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
status=`expr $status + $ret`
echo "I:exit status: $status"
echo_i "failed"
status=$((status+ret))
echo_i "exit status: $status"
exit $status
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:checking the new key with 'rndc tsig-list'"
echo_i "checking the new key with 'rndc tsig-list' ($n)"
ret=0
$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 tsig-list > rndc.out.3
grep "key \"bar.example.server" rndc.out.3 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:using the new key in a request"
echo_i "using the new key in a request ($n)"
ret=0
$DIG $DIGOPTS -k $keyname txt.example txt > dig.out.5 || ret=1
grep "status: NOERROR" dig.out.5 > /dev/null || ret=1
if [ $ret != 0 ]; then
echo "I:failed"
echo_i "failed"
fi
status=`expr $status + $ret`
n=$((n+1))
echo "I:exit status: $status"
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1