pullup:

the tkey test would randomly fail due to key IDs with a leading
zero being interpreted as octal numbers

diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index bdc99aaea2e0fe564df9f60925fa667ecce501cf..2b8939dca59b83cb25b7a688fe4656a651e1febe 100644 (file)
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -15,11 +15,11 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2001/01/11 20:51:19 bwelling Exp $
+# $Id: setup.sh,v 1.2.2.1 2001/10/12 20:11:43 gson Exp $
 
 RANDFILE=../random.data
 
 keyname=`$KEYGEN -a DH -b 768 -n host -r $RANDFILE server`
-keyid=`echo $keyname | perl -p -e 's/^.*\+//;'`
+keyid=`echo $keyname | perl -p -e 's/^.*\+0*//;'`
 rm -f named.conf
 perl -p -e "s/KEYID/$keyid/;" < named.conf.in > named.conf