From 468cf3cdc25a5198a9281e18ecc840778f546ef9 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Mon, 31 Jan 2022 16:53:40 +0100 Subject: [PATCH] Fix keyfromlabel echo output The 'id' variable is either keyfromlabel-ksk or keyfromlabel-zsk and is set in the 'keygen' and 'keyfromlabel' functions. It should not be used outside these functions. --- bin/tests/system/keyfromlabel/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/keyfromlabel/tests.sh b/bin/tests/system/keyfromlabel/tests.sh index 0bbbe1be3b..b54ea7b06c 100644 --- a/bin/tests/system/keyfromlabel/tests.sh +++ b/bin/tests/system/keyfromlabel/tests.sh @@ -61,12 +61,12 @@ do # Skip dnssec-keyfromlabel if key generation failed. test $ret == 0 || continue - echo_i "Get ZSK $alg $id-$zone $type:$bits" + echo_i "Get ZSK $alg $zone $type:$bits" ret=0 zsk=$(keyfromlabel $alg $zone keyfromlabel-zsk) test -z "$zsk" && ret=1 - echo_i "Get KSK $alg $id-$zone $type:$bits" + echo_i "Get KSK $alg $zone $type:$bits" ret=0 ksk=$(keyfromlabel $alg $zone keyfromlabel-ksk -f KSK) test -z "$ksk" && ret=1