diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/test-exec.sh | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -26,6 +26,9 @@ | |||
26 | - update usage() | 26 | - update usage() |
27 | - fix SYNOPSIS, and sort options | 27 | - fix SYNOPSIS, and sort options |
28 | - some minor additional fixes | 28 | - some minor additional fixes |
29 | - dtucker@cvs.openbsd.org 2008/06/09 18:06:32 | ||
30 | [regress/test-exec.sh] | ||
31 | Don't generate putty keys if we're not going to use them. ok djm | ||
29 | 32 | ||
30 | 20080609 | 33 | 20080609 |
31 | - (dtucker) OpenBSD CVS Sync | 34 | - (dtucker) OpenBSD CVS Sync |
@@ -4112,4 +4115,4 @@ | |||
4112 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4115 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4113 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4116 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4114 | 4117 | ||
4115 | $Id: ChangeLog,v 1.4953 2008/06/10 13:06:01 dtucker Exp $ | 4118 | $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 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.31 2007/12/21 04:13:53 djm Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.32 2008/06/09 18:06:32 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -287,9 +287,10 @@ for t in rsa rsa1; do | |||
287 | done | 287 | done |
288 | chmod 644 $OBJ/authorized_keys_$USER | 288 | chmod 644 $OBJ/authorized_keys_$USER |
289 | 289 | ||
290 | # If PuTTY is present, prepare keys and configuration | 290 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
291 | # configuration | ||
291 | REGRESS_INTEROP_PUTTY=no | 292 | REGRESS_INTEROP_PUTTY=no |
292 | if test -x "$PUTTYGEN" -a -x "$PLINK" ; then | 293 | if test -x $PUTTYGEN -a -x $PLINK && [[ $SCRIPT = *putty* ]] ; then |
293 | mkdir -p ${OBJ}/.putty | 294 | mkdir -p ${OBJ}/.putty |
294 | 295 | ||
295 | # Add a PuTTY key to authorized_keys | 296 | # Add a PuTTY key to authorized_keys |