1 files changed, 19 insertions, 6 deletions

diff --git a/regress/scp.sh b/regress/scp.sh
index 703cc0893..c3034b6e7 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"
@@ -12,16 +12,16 @@ else
         DIFFOPT="-r"
 fi
 
-DATA=/bin/ls
+DATA=/bin/ls${EXEEXT}
 COPY=${OBJ}/copy
 COPY2=${OBJ}/copy2
 DIR=${COPY}.dd
 DIR2=${COPY}.dd2
 
 SRC=`dirname ${SCRIPT}`
-cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.exe
-chmod 755 ${OBJ}/scp-ssh-wrapper.exe
-scpopts="-q -S ${OBJ}/scp-ssh-wrapper.exe"
+cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
+chmod 755 ${OBJ}/scp-ssh-wrapper.scp
+scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
 
 scpclean() {
         rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
@@ -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 ${DIFFOPT} ${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
@@ -79,4 +92,4 @@ for i in 0 1 2 3 4; do
 done
 
 scpclean
-rm -f ${OBJ}/scp-ssh-wrapper.exe
+rm -f ${OBJ}/scp-ssh-wrapper.scp