diff options
| author | Damien Miller <djm@mindrot.org> | 2014-02-28 10:19:11 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-02-28 10:19:11 +1100 |
| commit | f483cc16fe7314e24a37aa3a4422b03c013c3213 (patch) | |
| tree | ad843d80a811f113456d2ec95c357768c96a2602 | |
| parent | 6486f16f1c0ebd6f39286f6ab5e08286d90a994a (diff) | |
- dtucker@cvs.openbsd.org 2014/01/19 23:43:02
[regress/sftp-chroot.sh]
Don't use -q on sftp as it suppresses logging, instead redirect the
output to the regress logfile.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regress/sftp-chroot.sh | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -14,6 +14,11 @@ - djm@cvs.openbsd.org 2014/02/27 22:57:40 [version.h] openssh-6.6 + - dtucker@cvs.openbsd.org 2014/01/19 23:43:02 + [regress/sftp-chroot.sh] + Don't use -q on sftp as it suppresses logging, instead redirect the + output to the regress logfile. + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Crank version numbers diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh index 03b9bc6d..cb731dfe 100644 --- a/regress/sftp-chroot.sh +++ b/regress/sftp-chroot.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-chroot.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $ +# $OpenBSD: sftp-chroot.sh,v 1.3 2014/01/19 23:43:02 dtucker Exp $ # Placed in the Public Domain. tid="sftp in chroot" @@ -18,7 +18,8 @@ $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \ start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /" verbose "test $tid: get" -${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \ +${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ + >$TEST_REGRESS_LOGFILE 2>&1 || \ fatal "Fetch ${FILENAME} failed" cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" |