- 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.

diff --git a/ChangeLog b/ChangeLog
index 7e27013b1ba62f2922ceceafa0bb41d0dfb756f1..f6ffb16a0c08ad824700c12983e27d090a7918bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 03b9bc6d73230ebbecdd83a7c3830fc5f9cb0f92..cb731dfe852f7f79aa169be5045303ce2580953a 100644 (file)
--- 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"