summaryrefslogtreecommitdiff
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 9376eab58..ae91e19c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120040212
2 - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]
3 Portablity fixes. Data sftp transfers needs to be world readable. Some
4 older shells hang on while loops when doing sh -n some_script. OK dtucker@
5
120040211 620040211
2 - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check 7 - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
3 if HAS_SHADOW_EXPIRY is set. 8 if HAS_SHADOW_EXPIRY is set.
@@ -1845,4 +1850,4 @@
1845 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1850 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1846 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1851 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1847 1852
1848$Id: ChangeLog,v 1.3226 2004/02/11 22:46:40 tim Exp $ 1853$Id: ChangeLog,v 1.3227 2004/02/12 15:17:10 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 2d7982312..eae406aa7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.255 2004/02/10 02:01:14 dtucker Exp $ 1# $Id: Makefile.in,v 1.256 2004/02/12 15:17:11 tim Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -375,6 +375,7 @@ tests: $(TARGETS)
375 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 375 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
376 [ -f `pwd`/regress/Makefile ] || \ 376 [ -f `pwd`/regress/Makefile ] || \
377 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ 377 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
378 TEST_SHELL="@TEST_MINUS_S_SH@"; \
378 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 379 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
379 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 380 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
380 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ 381 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -390,6 +391,7 @@ tests: $(TARGETS)
390 BUILDDIR="$${BUILDDIR}" \ 391 BUILDDIR="$${BUILDDIR}" \
391 OBJ="$${BUILDDIR}/regress/" \ 392 OBJ="$${BUILDDIR}/regress/" \
392 PATH="$${BUILDDIR}:$${PATH}" \ 393 PATH="$${BUILDDIR}:$${PATH}" \
394 TEST_SHELL="$${TEST_SHELL}" \
393 TEST_SSH_SSH="$${TEST_SSH_SSH}" \ 395 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
394 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 396 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
395 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ 397 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index a6a19409d..eac189aaf 100644
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -4,7 +4,7 @@
4tid="sftp invalid commands" 4tid="sftp invalid commands"
5 5
6DATA=/bin/ls${EXEEXT} 6DATA=/bin/ls${EXEEXT}
7DATA2=/bin/cat${EXEEXT} 7DATA2=/bin/sh${EXEEXT}
8NONEXIST=/NONEXIST.$$ 8NONEXIST=/NONEXIST.$$
9COPY=${OBJ}/copy 9COPY=${OBJ}/copy
10GLOBFILES=`(cd /bin;echo l*)` 10GLOBFILES=`(cd /bin;echo l*)`
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index debe7e3a4..98851dc97 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -30,7 +30,7 @@ if [ ! -f $SCRIPT ]; then
30 echo "not a file: $SCRIPT" 30 echo "not a file: $SCRIPT"
31 exit 2 31 exit 2
32fi 32fi
33if sh -n $SCRIPT; then 33if $TEST_SHELL -n $SCRIPT; then
34 true 34 true
35else 35else
36 echo "syntax error in $SCRIPT" 36 echo "syntax error in $SCRIPT"