summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-08-23 23:32:05 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-08-23 23:32:05 +1000
commit114572f7ee4acd2aab331784f658851e5fbad9a4 (patch)
tree249e27bc5a236af1c6b6f7e42a90441f655b9b2c
parent93e7e8f345367136b4c3881c6eb3d756a43fe148 (diff)
- (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully-
qualified sshd pathname since some systems (eg Cygwin) may consider "/foo" and "//foo" to be different. Spotted by vinschen at redhat.com.
-rw-r--r--ChangeLog7
-rw-r--r--regress/test-exec.sh7
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f9db29ad..5d6982ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050823
+ - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully-
+ qualified sshd pathname since some systems (eg Cygwin) may consider "/foo"
+ and "//foo" to be different. Spotted by vinschen at redhat.com.
+
20050821
- (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for
LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@
@@ -2945,4 +2950,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3875 2005/08/22 22:06:55 dtucker Exp $
+$Id: ChangeLog,v 1.3876 2005/08/23 13:32:05 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index bd0c025b..4b3a70eb 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -96,9 +96,10 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
fi
# Path to sshd must be absolute for rexec
-if [ ! -x /$SSHD ]; then
- SSHD=`which sshd`
-fi
+case "$SSHD" in
+/*) ;;
+*) SSHD=`which sshd` ;;
+esac
if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
TEST_SSH_LOGFILE=/dev/null