From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 3 Dec 2020 08:03:21 +0000 (+0100)
Subject: Small adjustments to kasp rndc_checkds function
X-Git-Tag: v9.16.11~11^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b72ad5e9207b0bcb1961ee356c01b06f6f086d;p=thirdparty%2Fbind9.git

Small adjustments to kasp rndc_checkds function

Slightly better test output, and only call 'load keys' if the
'rndc checkds' call succeeded.

(cherry picked from commit 756674f6d1e62e4f5eabbb71e80a25974a32783c)
---

diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh
index 9a4573000a8..9f53253401f 100644
--- a/bin/tests/system/kasp/tests.sh
+++ b/bin/tests/system/kasp/tests.sh
@@ -1257,21 +1257,23 @@ rndc_checkds() {
 	_keycmd=""
 	if [ "${_key}" != "-" ]; then
 		_keyid=$(key_get $_key ID)
-		_keycmd="-key ${_keyid}"
+		_keycmd=" -key ${_keyid}"
 	fi
 
 	_whencmd=""
 	if [ "${_when}" != "now" ]; then
-		_whencmd="-when ${_when}"
+		_whencmd=" -when ${_when}"
 	fi
 
 	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
 
-	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"
 	status=$((status+ret))