2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9df10f757..1bccb8904 100644
--- 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
@@ -4112,4 +4115,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4953 2008/06/10 13:06:01 dtucker Exp $
+$Id: ChangeLog,v 1.4954 2008/06/10 13:15:54 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e67dd7b5d..89470682b 100644
--- 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