diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:15:54 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:15:54 +1000 |
| commit | d788b7cb35ed9964f8a15201e3b28e992228eadb (patch) | |
| tree | 2e27fb8e3a6f45160e87d44881a518d6f752f156 /regress/test-exec.sh | |
| parent | e7f3f75651449900f061e43007b1fad027aec295 (diff) | |
| download | openssh-git-d788b7cb35ed9964f8a15201e3b28e992228eadb.tar.gz | |
- 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
Diffstat (limited to 'regress/test-exec.sh')
| -rw-r--r-- | regress/test-exec.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index e67dd7b5..89470682 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 |