summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-28 10:19:51 +1100
committerDamien Miller <djm@mindrot.org>2014-02-28 10:19:51 +1100
commit1e2aa3d90472293ea19008f02336d6d68aa05793 (patch)
treea4b5eebb25cdf6c4c4a11635516b4964607036a4
parentf483cc16fe7314e24a37aa3a4422b03c013c3213 (diff)
- dtucker@cvs.openbsd.org 2014/01/20 00:00:30
[sftp-chroot.sh] append to rather than truncating the log file
-rw-r--r--ChangeLog4
-rw-r--r--regress/sftp-chroot.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f6ffb16a0..7d8d827ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,9 @@
18 [regress/sftp-chroot.sh] 18 [regress/sftp-chroot.sh]
19 Don't use -q on sftp as it suppresses logging, instead redirect the 19 Don't use -q on sftp as it suppresses logging, instead redirect the
20 output to the regress logfile. 20 output to the regress logfile.
21 21 - dtucker@cvs.openbsd.org 2014/01/20 00:00:30
22 [sftp-chroot.sh]
23 append to rather than truncating the log file
22 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 24 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
23 [contrib/suse/openssh.spec] Crank version numbers 25 [contrib/suse/openssh.spec] Crank version numbers
24 26
diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh
index cb731dfe8..23f7456e8 100644
--- a/regress/sftp-chroot.sh
+++ b/regress/sftp-chroot.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: sftp-chroot.sh,v 1.3 2014/01/19 23:43:02 dtucker Exp $ 1# $OpenBSD: sftp-chroot.sh,v 1.4 2014/01/20 00:00:30 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sftp in chroot" 4tid="sftp in chroot"
@@ -19,7 +19,7 @@ start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /"
19 19
20verbose "test $tid: get" 20verbose "test $tid: get"
21${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ 21${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \
22 >$TEST_REGRESS_LOGFILE 2>&1 || \ 22 >>$TEST_REGRESS_LOGFILE 2>&1 || \
23 fatal "Fetch ${FILENAME} failed" 23 fatal "Fetch ${FILENAME} failed"
24cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" 24cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ"
25 25