- (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

diff --git a/ChangeLog b/ChangeLog
index 3e3da2708f65e73b3d33a65cc780ffe584f9c1ad..f63a25db0c0351042eca7fcb263b164f6af1a95c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index cf7665973d62f924035eae07b096a0b178584f67..e67dd7b5d62f7d72d84c5dc77f5e915a55a71e90 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -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