From f899e6a5265ac173acbac51022a2512643ec909c Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 14 Mar 2005 23:02:46 +1100 Subject: 20050312 - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug output ends up in the client's output, causing regress failures. Found by Corinna Vinschen. (got 4.0 branch and HEAD slightly askew, this is to resync) --- regress/test-exec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'regress/test-exec.sh') diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4e53449be..bd0c025ba 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -197,7 +197,7 @@ cat << EOF > $OBJ/sshd_config #ListenAddress ::1 PidFile $PIDFILE AuthorizedKeysFile $OBJ/authorized_keys_%u - LogLevel DEBUG + LogLevel VERBOSE AcceptEnv _XXX_TEST_* AcceptEnv _XXX_TEST Subsystem sftp $SFTPSERVER -- cgit v1.2.3 From 114572f7ee4acd2aab331784f658851e5fbad9a4 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 23 Aug 2005 23:32:05 +1000 Subject: - (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. --- ChangeLog | 7 ++++++- regress/test-exec.sh | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'regress/test-exec.sh') diff --git a/ChangeLog b/ChangeLog index f9db29ad5..5d6982ff4 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 bd0c025ba..4b3a70eb3 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 -- cgit v1.2.3