- dtucker@cvs.openbsd.org 2008/06/09 18:06:32

     [regress/test-exec.sh]
     Don't generate putty keys if we're not going to use them.  ok djm

diff --git a/ChangeLog b/ChangeLog
index 98fad57fe6c85f75632d9e001e8b23280cd16ffb..8bbb81e62382ddfe5d77ed177d8b2403dbeacf76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
      - update usage()
      - fix SYNOPSIS, and sort options
      - some minor additional fixes
+   - dtucker@cvs.openbsd.org 2008/06/09 18:06:32
+     [regress/test-exec.sh]
+     Don't generate putty keys if we're not going to use them.  ok djm
 
 20080609
  - (dtucker) OpenBSD CVS Sync

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e67dd7b5d62f7d72d84c5dc77f5e915a55a71e90..89470682beb8cf01aa39f47d5081c5da03c9e8ca 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.31 2007/12/21 04:13:53 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.32 2008/06/09 18:06:32 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -287,9 +287,10 @@ for t in rsa rsa1; do
 done
 chmod 644 $OBJ/authorized_keys_$USER
 
-# If PuTTY is present, prepare keys and configuration
+# If PuTTY is present and we are running a PuTTY test, prepare keys and
+# configuration
 REGRESS_INTEROP_PUTTY=no
-if test -x "$PUTTYGEN" -a -x "$PLINK" ; then
+if test -x $PUTTYGEN -a -x $PLINK && [[ $SCRIPT = *putty* ]] ; then
        mkdir -p ${OBJ}/.putty
 
        # Add a PuTTY key to authorized_keys