diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | regress/scp.sh | 4 |
2 files changed, 7 insertions, 4 deletions
@@ -47,8 +47,11 @@ | |||
47 | force addressfamily=inet for tests, unbreaking dynamic-forward regress for | 47 | force addressfamily=inet for tests, unbreaking dynamic-forward regress for |
48 | recently committed nc SOCKS5 changes | 48 | recently committed nc SOCKS5 changes |
49 | - djm@cvs.openbsd.org 2005/05/24 04:10:54 | 49 | - djm@cvs.openbsd.org 2005/05/24 04:10:54 |
50 | [try-ciphers.sh] | 50 | [regress/try-ciphers.sh] |
51 | oops, new arcfour modes here too | 51 | oops, new arcfour modes here too |
52 | - markus@cvs.openbsd.org 2005/06/30 11:02:37 | ||
53 | [regress/scp.sh] | ||
54 | allow SUDO=sudo; from Alexander Bluhm | ||
52 | 55 | ||
53 | 20060129 | 56 | 20060129 |
54 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the | 57 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the |
@@ -3774,4 +3777,4 @@ | |||
3774 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3777 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3775 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3778 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3776 | 3779 | ||
3777 | $Id: ChangeLog,v 1.4105 2006/01/31 10:59:35 djm Exp $ | 3780 | $Id: ChangeLog,v 1.4106 2006/01/31 11:01:42 djm Exp $ |
diff --git a/regress/scp.sh b/regress/scp.sh index c3034b6e7..1043b8ea2 100644 --- a/regress/scp.sh +++ b/regress/scp.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: scp.sh,v 1.3 2004/07/08 12:59:35 dtucker Exp $ | 1 | # $OpenBSD: scp.sh,v 1.4 2005/06/30 11:02:37 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="scp" | 4 | tid="scp" |
@@ -73,7 +73,7 @@ if [ ! -z "$SUDO" ]; then | |||
73 | chmod 660 ${DIR2}/copy | 73 | chmod 660 ${DIR2}/copy |
74 | $SUDO chown root ${DIR2}/copy | 74 | $SUDO chown root ${DIR2}/copy |
75 | $SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1 | 75 | $SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1 |
76 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" | 76 | $SUDO diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" |
77 | $SUDO rm ${DIR2}/copy | 77 | $SUDO rm ${DIR2}/copy |
78 | fi | 78 | fi |
79 | 79 | ||