From 3ce2018dfa0912a29666e7e477a9daddf23fc224 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 25 Jul 2012 12:59:45 +1000 Subject: [PATCH] 3355. [port] Use more portable awk in verify system test. --- CHANGES | 2 ++ bin/tests/system/verify/zones/genzones.sh | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 245df18ce1..e69338123e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3355. [port] Use more portable awk in verify system test. + 3354. [func] Improve OpenSSL error logging. [RT #29932] 3353. [bug] Use a single task for task exclusive operations. diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh index d1c3156aa1..d2fde9a4f3 100644 --- a/bin/tests/system/verify/zones/genzones.sh +++ b/bin/tests/system/verify/zones/genzones.sh @@ -184,8 +184,13 @@ zsk=`$KEYGEN -3 -r $RANDFILE ${zone} 2> kg1.out$n` || dumpit kg1.out$n ksk=`$KEYGEN -3 -r $RANDFILE -fK ${zone} 2> kg2.out$n` || dumpit kg2.out$n cat unsigned.db $ksk.key $zsk.key > $file $SIGNER -3 - -P -O full -o ${zone} -f ${file} ${file} $ksk > s.out$n 2>&1 || dumpit s.out$n -awk -v ZONE=${zone}. '$4 == "NSEC3" && NF == 9 { +awk ' +BEGIN { + ZONE="'${zone}'."; +} +$4 == "NSEC3" && NF == 9 { $1 = "H9P7U7TR2U91D0V0LJS9L1GIDNP90U3H." ZONE; $9 = "H9P7U7TR2U91D0V0LJS9L1GIDNP90U3I"; - print; }' ${file} >> ${file} + print; +}' ${file} >> ${file} $SIGNER -3 - -Px -Z nonsecify -O full -o ${zone} -f ${file} ${file} $zsk > s.out$n 2>&1 || dumpit s.out$n