From ccf077918587d9f881dd31577e2129d301572b13 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 6 Dec 2004 23:03:27 +1100
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2004/07/08 12:59:35     
 [scp.sh]      Regress test for bz #863 (scp double-error), requires $SUDO. 
 ok markus@

---
 ChangeLog      |  5 ++++-
 regress/scp.sh | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 238318846..d8b535fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
      [reexec.sh]
      don't change the name of the copied sshd for the reexec fallback test,
      makes life simpler for portable
+   - dtucker@cvs.openbsd.org 2004/07/08 12:59:35
+     [scp.sh]
+     Regress test for bz #863 (scp double-error), requires $SUDO.  ok markus@
 
 20041203
  - (dtucker) OpenBSD CVS Sync
@@ -1899,4 +1902,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3591 2004/12/06 12:00:27 dtucker Exp $
+$Id: ChangeLog,v 1.3592 2004/12/06 12:03:27 dtucker Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index 6b5664283..39e8af4c6 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: scp.sh,v 1.2 2004/06/16 13:15:09 dtucker Exp $
+#	$OpenBSD: scp.sh,v 1.3 2004/07/08 12:59:35 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="scp"
@@ -64,6 +64,19 @@ cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
 diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
 
+if [ ! -z "$SUDO" ]; then
+	verbose "$tid: skipped file after scp -p with failed chown+utimes"
+	scpclean
+	cp -p ${DATA} ${DIR}/copy
+	cp -p ${DATA} ${DIR}/copy2
+	cp ${DATA} ${DIR2}/copy
+	chmod 660 ${DIR2}/copy
+	$SUDO chown root ${DIR2}/copy
+	$SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1
+	diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+	$SUDO rm ${DIR2}/copy
+fi
+
 for i in 0 1 2 3 4; do
 	verbose "$tid: disallow bad server #$i"
 	SCPTESTMODE=badserver_$i