summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-04 15:16:56 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-04 15:16:56 +1000
commit53c55f41798a7c386251f6922046b8d1f551a8f9 (patch)
treecc061f9ea7f2e868aa4eb96be58f1059b67c3296
parent58f89bc14db0475c52abff7376111269cc892af8 (diff)
- [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
regress/test-exec.sh] Handle different was of echoing without newlines.
-rw-r--r--ChangeLog4
-rw-r--r--regress/agent.sh2
-rw-r--r--regress/proto-version.sh2
-rw-r--r--regress/ssh-com.sh2
-rw-r--r--regress/test-exec.sh15
5 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e11f53d..256d8c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
- [regress/sftp.sh] Remove dependency on /dev/stdin.
- [regress/agent-ptrace.sh regress/agent-timeout.sh]
"grep -q" -> "grep >/dev/null"
+ - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
+ regress/test-exec.sh] Handle different was of echoing without newlines.
20030903
- (djm) OpenBSD CVS Sync
@@ -1007,4 +1009,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.2951 2003/09/04 05:07:59 dtucker Exp $
+$Id: ChangeLog,v 1.2952 2003/09/04 05:16:56 dtucker Exp $
diff --git a/regress/agent.sh b/regress/agent.sh
index 7e9b4cb1..b3448776 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -19,7 +19,7 @@ else
fail "ssh-add -l did not fail with exit code 1"
fi
trace "overwrite authorized keys"
- echo -n > $OBJ/authorized_keys_$USER
+ echon > $OBJ/authorized_keys_$USER
for t in rsa rsa1; do
# generate user key for agent
rm -f $OBJ/$t-agent
diff --git a/regress/proto-version.sh b/regress/proto-version.sh
index 7dc616f5..1651a69e 100644
--- a/regress/proto-version.sh
+++ b/regress/proto-version.sh
@@ -8,7 +8,7 @@ check_version ()
{
version=$1
expect=$2
- banner=`echo -n | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
+ banner=`echon | ${SSHD} -o "Protocol=${version}" -i -f ${OBJ}/sshd_proxy`
case ${banner} in
SSH-1.99-*)
proto=199
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index c915cc39..78ae6e9e 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -67,7 +67,7 @@ done
# convert and append DSA hostkey
(
- echo -n 'ssh2-localhost-with-alias,127.0.0.1,::1 '
+ echon 'ssh2-localhost-with-alias,127.0.0.1,::1 '
${SSHKEYGEN} -if ${SRC}/dsa_ssh2.pub
) >> $OBJ/known_hosts
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a7a8ddbe..35f555b2 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -72,6 +72,17 @@ export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER
#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER
# helper
+echon()
+{
+ if [ "x`echo -n`" = "x" ]; then
+ echo -n "$@"
+ elif [ "x`echo '\c'`" = "x" ]; then
+ echo "$@\c"
+ else
+ fatal "Don't know how to echo without newline."
+ fi
+}
+
cleanup ()
{
if [ -f $PIDFILE ]; then
@@ -111,7 +122,7 @@ fail ()
fatal ()
{
- echo -n "FATAL: "
+ echon "FATAL: "
fail "$@"
cleanup
exit $RESULT
@@ -169,7 +180,7 @@ for t in rsa rsa1; do
# known hosts file for client
(
- echo -n 'localhost-with-alias,127.0.0.1,::1 '
+ echon 'localhost-with-alias,127.0.0.1,::1 '
cat $OBJ/$t.pub
) >> $OBJ/known_hosts