summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.in4
-rw-r--r--regress/sftp-badcmds.sh2
-rw-r--r--regress/test-exec.sh2
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9376eab5..ae91e19c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20040212
+ - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]
+ Portablity fixes. Data sftp transfers needs to be world readable. Some
+ older shells hang on while loops when doing sh -n some_script. OK dtucker@
+
20040211
- (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
if HAS_SHADOW_EXPIRY is set.
@@ -1845,4 +1850,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3226 2004/02/11 22:46:40 tim Exp $
+$Id: ChangeLog,v 1.3227 2004/02/12 15:17:10 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 2d798231..eae406aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.255 2004/02/10 02:01:14 dtucker Exp $
+# $Id: Makefile.in,v 1.256 2004/02/12 15:17:11 tim Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -375,6 +375,7 @@ tests: $(TARGETS)
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
[ -f `pwd`/regress/Makefile ] || \
ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
+ TEST_SHELL="@TEST_MINUS_S_SH@"; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -390,6 +391,7 @@ tests: $(TARGETS)
BUILDDIR="$${BUILDDIR}" \
OBJ="$${BUILDDIR}/regress/" \
PATH="$${BUILDDIR}:$${PATH}" \
+ TEST_SHELL="$${TEST_SHELL}" \
TEST_SSH_SSH="$${TEST_SSH_SSH}" \
TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index a6a19409..eac189aa 100644
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -4,7 +4,7 @@
tid="sftp invalid commands"
DATA=/bin/ls${EXEEXT}
-DATA2=/bin/cat${EXEEXT}
+DATA2=/bin/sh${EXEEXT}
NONEXIST=/NONEXIST.$$
COPY=${OBJ}/copy
GLOBFILES=`(cd /bin;echo l*)`
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index debe7e3a..98851dc9 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -30,7 +30,7 @@ if [ ! -f $SCRIPT ]; then
echo "not a file: $SCRIPT"
exit 2
fi
-if sh -n $SCRIPT; then
+if $TEST_SHELL -n $SCRIPT; then
true
else
echo "syntax error in $SCRIPT"