summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-15 09:25:54 +1100
committerDamien Miller <djm@mindrot.org>2008-03-15 09:25:54 +1100
commit8f8b156acc3028532cfe19052772eb80ac22eb62 (patch)
tree804bd4b2c0950659329714809dcbd099b3b86bc6 /regress
parent02db85bdcbb07f632cddd927ded208f3d4f1e65f (diff)
- (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
Diffstat (limited to 'regress')
-rw-r--r--regress/test-exec.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index cf7665973..e67dd7b5d 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -104,14 +104,14 @@ if [ "x$TEST_SSH_PLINK" != "x" ]; then
104 # Find real binary, if it exists 104 # Find real binary, if it exists
105 case "${TEST_SSH_PLINK}" in 105 case "${TEST_SSH_PLINK}" in
106 /*) PLINK="${TEST_SSH_PLINK}" ;; 106 /*) PLINK="${TEST_SSH_PLINK}" ;;
107 *) PLINK=`which ${TEST_SSH_PLINK}` ;; 107 *) PLINK=`which ${TEST_SSH_PLINK} 2>/dev/null` ;;
108 esac 108 esac
109fi 109fi
110if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then 110if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
111 # Find real binary, if it exists 111 # Find real binary, if it exists
112 case "${TEST_SSH_PUTTYGEN}" in 112 case "${TEST_SSH_PUTTYGEN}" in
113 /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;; 113 /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;;
114 *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN}` ;; 114 *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
115 esac 115 esac
116fi 116fi
117 117
@@ -289,7 +289,7 @@ chmod 644 $OBJ/authorized_keys_$USER
289 289
290# If PuTTY is present, prepare keys and configuration 290# If PuTTY is present, prepare keys and configuration
291REGRESS_INTEROP_PUTTY=no 291REGRESS_INTEROP_PUTTY=no
292if test -x $PUTTYGEN -a -x $PLINK ; then 292if test -x "$PUTTYGEN" -a -x "$PLINK" ; then
293 mkdir -p ${OBJ}/.putty 293 mkdir -p ${OBJ}/.putty
294 294
295 # Add a PuTTY key to authorized_keys 295 # Add a PuTTY key to authorized_keys