diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regress/sftp-cmds.sh | 6 | ||||
| -rwxr-xr-x | regress/ssh2putty.sh | 4 |
3 files changed, 9 insertions, 5 deletions
@@ -5,6 +5,8 @@ puttygen(1) by $PATH - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch by vinschen at redhat.com. + - (tim) [regress/sftp-cmds.sh regress/ssh2putty.sh] Shell portability fixes + from imorgan at nas.nasa.gov 20080312 - (djm) OpenBSD CVS Sync @@ -3748,4 +3750,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4873 2008/03/14 00:59:50 tim Exp $ +$Id: ChangeLog,v 1.4874 2008/03/14 01:21:06 tim Exp $ diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index a9bf50472..3cd7e6b4b 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh @@ -44,12 +44,12 @@ rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 mkdir ${COPY}.dd verbose "$tid: lls" -echo "cd ${OBJ}\nlls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \ - grep -q copy.dd || fail "lls failed" +echo "cd ${OBJ}" ; echo "lls" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \ + grep copy.dd >/dev/null 2>&1 || fail "lls failed" verbose "$tid: lls w/path" echo "lls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} 2>&1 | \ - grep -q copy.dd || fail "lls w/path failed" + grep copy.dd >/dev/null 2>&1 || fail "lls w/path failed" verbose "$tid: ls" echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh index 82dd44787..dfdeeff4a 100755 --- a/regress/ssh2putty.sh +++ b/regress/ssh2putty.sh @@ -10,7 +10,9 @@ PORT=$2 KEYFILE=$3 # XXX - support DSA keys too -if ! grep -q "BEGIN RSA PRIVATE KEY" $KEYFILE ; then +if grep "BEGIN RSA PRIVATE KEY" $KEYFILE >/dev/null 2>&1 ; then + : +else echo "Unsupported private key format" exit 1 fi |