summaryrefslogtreecommitdiff
path: root/regress/sftp-chroot.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 15:32:29 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 15:32:29 +1000
commit59d928d3b47e8298f4a8b4b3fb37fb8c8ce1b098 (patch)
tree69e341bea63449e27da3bcb836b646c7c40a6b4f /regress/sftp-chroot.sh
parent34035be27b7ddd84706fe95c39d37cba7d5c9572 (diff)
- dtucker@cvs.openbsd.org 2013/05/17 04:29:14
[regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh regress/multiplex.sh] Move the setting of DATA and COPY into test-exec.sh
Diffstat (limited to 'regress/sftp-chroot.sh')
-rw-r--r--regress/sftp-chroot.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh
index 8c07979b4..98a364ebf 100644
--- a/regress/sftp-chroot.sh
+++ b/regress/sftp-chroot.sh
@@ -1,9 +1,8 @@
1# $OpenBSD: sftp-chroot.sh,v 1.1 2013/04/18 02:46:12 djm Exp $ 1# $OpenBSD: sftp-chroot.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sftp in chroot" 4tid="sftp in chroot"
5 5
6COPY=${OBJ}/copy
7CHROOT=/var/run 6CHROOT=/var/run
8FILENAME=testdata_${USER} 7FILENAME=testdata_${USER}
9PRIVDATA=${CHROOT}/${FILENAME} 8PRIVDATA=${CHROOT}/${FILENAME}
@@ -18,7 +17,6 @@ $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \
18start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /" 17start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /"
19 18
20verbose "test $tid: get" 19verbose "test $tid: get"
21rm -f ${COPY}
22${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \ 20${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \
23 fatal "Fetch ${FILENAME} failed" 21 fatal "Fetch ${FILENAME} failed"
24cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" 22cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ"