summaryrefslogtreecommitdiff
path: root/regress/usr.bin/ssh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/usr.bin/ssh')
-rw-r--r--regress/usr.bin/ssh/test-exec.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 1482a2539f7..45e744679cc 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/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.
USER=`id -un`
@@ -232,9 +232,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