From: Michał Kępień <michal@isc.org>
Date: Mon, 17 Jun 2019 12:15:18 +0000 (+0200)
Subject: Fix key ID processing
X-Git-Tag: v9.14.4~28^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b9820ec727ce6214f373c1bdce33a1d101472e06;p=thirdparty%2Fbind9.git

Fix key ID processing

If ns1/setup.sh generates a key with ID 0, the "KEYID" token in
ns1/named.conf.in will be replaced with an empty string, causing the
following broken statement to appear in ns1/named.conf:

    tkey-dhkey "server" ;

Such a statement triggers false positives for the "tkey" system test due
to ns1 being unable to start with a broken configuration file.  Fix by
tweaking the regular expression used for removing leading zeros from the
key ID, so that it removes at most 4 leading zeros.

(cherry picked from commit 0b7b1161c215bf4e08467c79282dddc34bda2240)
---

diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index 6bf84c7c4bb..36ed3344ae2 100644
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -13,6 +13,6 @@ SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
 keyname=`$KEYGEN -T KEY -a DH -b 768 -n host server`
-keyid=`echo $keyname | $PERL -p -e 's/^.*\+0*//;'`
+keyid=`echo $keyname | $PERL -p -e 's/^.*\+0{0,4}//;'`
 rm -f named.conf
 sed -e "s;KEYID;$keyid;" < named.conf.in > named.conf