- (djm) [regress/test-exec.sh] Quote putty-related variables in case they are

empty; report and patch from Peter Stuge
 - (djm) [regress/test-exec.sh] Silence noise from detection of putty
   commands; report from Peter Stuge
This commit is contained in:
Damien Miller 2008-03-15 09:25:54 +11:00
parent 02db85bdcb
commit 8f8b156acc
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
20080315
- (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
empty; report and patch from Peter Stuge
- (djm) [regress/test-exec.sh] Silence noise from detection of putty
commands; report from Peter Stuge
20080314
- (tim) [regress/sftp-cmds.sh] s/cd/lcd/ in lls test. Reported by
vinschen at redhat.com. Add () to put echo commands in subshell for lls test
@ -3757,4 +3763,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.4877 2008/03/14 18:02:51 tim Exp $
$Id: ChangeLog,v 1.4878 2008/03/14 22:25:54 djm Exp $

View File

@ -104,14 +104,14 @@ if [ "x$TEST_SSH_PLINK" != "x" ]; then
# Find real binary, if it exists
case "${TEST_SSH_PLINK}" in
/*) PLINK="${TEST_SSH_PLINK}" ;;
*) PLINK=`which ${TEST_SSH_PLINK}` ;;
*) PLINK=`which ${TEST_SSH_PLINK} 2>/dev/null` ;;
esac
fi
if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
# Find real binary, if it exists
case "${TEST_SSH_PUTTYGEN}" in
/*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;;
*) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN}` ;;
*) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
esac
fi
@ -289,7 +289,7 @@ chmod 644 $OBJ/authorized_keys_$USER
# If PuTTY is present, prepare keys and configuration
REGRESS_INTEROP_PUTTY=no
if test -x $PUTTYGEN -a -x $PLINK ; then
if test -x "$PUTTYGEN" -a -x "$PLINK" ; then
mkdir -p ${OBJ}/.putty
# Add a PuTTY key to authorized_keys