mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Small adjustments to kasp rndc_checkds function

Browse Source 
Slightly better test output, and only call 'load keys' if the
'rndc checkds' call succeeded.
This commit is contained in:
Matthijs Mekking
2020-12-03 09:03:21 +01:00
parent fa2e4e66b0
commit 756674f6d1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/kasp/tests.sh
View File

@@ -1256,21 +1256,23 @@ rndc_checkds() {
_keycmd="" _keycmd=""
if [ "${_key}" != "-" ]; then if [ "${_key}" != "-" ]; then
_keyid=$(key_get $_key ID) _keyid=$(key_get $_key ID)
_keycmd="-key ${_keyid}" _keycmd=" -key ${_keyid}"
fi fi
_whencmd="" _whencmd=""
if [ "${_when}" != "now" ]; then if [ "${_when}" != "now" ]; then
_whencmd="-when ${_when}" _whencmd=" -when ${_when}"
fi fi
n=$((n+1)) n=$((n+1))
echo_i "calling rndc dnssec -checkds ${_keycmd} ${_whencmd} ${_what} zone ${_zone} ($n)" echo_i "calling rndc dnssec -checkds${_keycmd}${_whencmd} ${_what} zone ${_zone} in ${_view} ($n)"
ret=0 ret=0
rndccmd $_server dnssec -checkds $_keycmd $_whencmd $_what $_zone in $_view > rndc.dnssec.checkds.out.$_zone.$n || log_error "rndc dnssec -checkds (${_keycmd} ${_whencmd} ${_what} zone ${_zone} failed" rndccmd $_server dnssec -checkds $_keycmd $_whencmd $_what $_zone in $_view > rndc.dnssec.checkds.out.$_zone.$n || log_error "rndc dnssec -checkds${_keycmd}${_whencmd} ${_what} zone ${_zone} failed"
_loadkeys_on $_server $_dir $_zone || log_error "loadkeys zone ${_zone} failed ($n)" if [ "$ret" -eq 0 ]; then
_loadkeys_on $_server $_dir $_zone || log_error "loadkeys zone ${_zone} failed ($n)"
fi
test "$ret" -eq 0 || echo_i "failed" test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret)) status=$((status+ret))