from imorgan at nas.nasa.gov
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.
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
20080312
- (djm) OpenBSD CVS Sync
mkdir ${COPY}.dd
verbose "$tid: lls"
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 | \
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 \
verbose "$tid: ls"
echo "ls ${OBJ}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
KEYFILE=$3
# XXX - support DSA keys too
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
echo "Unsupported private key format"
exit 1
fi