[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@

diff --git a/ChangeLog b/ChangeLog
index ccbadc2fe21bc08436579d9faadad26cd8e50663..bedc682ddf90be6eb4a8e05cdaac9ea5614b3ef5 100644 (file)
--- 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.

diff --git a/Makefile.in b/Makefile.in
index fbaa6dcac2eb686fbbbb2e018a69ce15a3f8936f..060850ca4e19b4652c30fbce2cb45b2a52be5fd9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 a6a19409d1718843b39a6cd73908001a47847df2..eac189aaf31aaf160685c90bc223abf22f2ce985 100644 (file)
--- 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 debe7e3a4dd1255a33c77592b18340d82a12573e..98851dc974240f4215c2e9319d91d8d140bfbb69 100644 (file)
--- 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"