diff options
| author | Damien Miller <djm@mindrot.org> | 2008-03-14 23:25:54 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-03-14 23:25:54 +0100 |
| commit | 8f8b156acc3028532cfe19052772eb80ac22eb62 (patch) | |
| tree | 804bd4b2c0950659329714809dcbd099b3b86bc6 /regress/test-exec.sh | |
| parent | - (tim) [regress/localcommand.sh] Shell portability fix. Reported by imorgan at (diff) | |
| download | openssh-8f8b156acc3028532cfe19052772eb80ac22eb62.tar.xz openssh-8f8b156acc3028532cfe19052772eb80ac22eb62.zip | |
- (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 '')
| -rw-r--r-- | regress/test-exec.sh | 6 |
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 # 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 |