summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-27 11:26:56 +1100
committerDamien Miller <djm@mindrot.org>2008-03-27 11:26:56 +1100
commit6f1c462ca31c97a72e37cc7fb4cb44631f2852b0 (patch)
tree87dc632f2ae9bbf07c03d5a809c5217bb200b873
parent2ff24f66bf5a955bd8beec5dcd1badab04b7ef66 (diff)
downloadopenssh-git-6f1c462ca31c97a72e37cc7fb4cb44631f2852b0.tar.gz
- djm@cvs.openbsd.org 2008/03/24 21:46:54
[regress/sftp-badcmds.sh] disable no-replace rename test now that we prefer a POSIX rename; spotted by dkrause@
-rw-r--r--ChangeLog6
-rw-r--r--regress/sftp-badcmds.sh13
2 files changed, 6 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 527dceef..456c1f61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@
- djm@cvs.openbsd.org 2008/03/27 00:16:49
[version.h]
openssh-4.9
+ - djm@cvs.openbsd.org 2008/03/24 21:46:54
+ [regress/sftp-badcmds.sh]
+ disable no-replace rename test now that we prefer a POSIX rename; spotted
+ by dkrause@
20080315
- (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3814,4 +3818,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4890 2008/03/27 00:18:13 djm Exp $
+$Id: ChangeLog,v 1.4891 2008/03/27 00:26:56 djm Exp $
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index eac189aa..b48b1cb0 100644
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: sftp-badcmds.sh,v 1.2 2003/05/15 04:07:12 mouring Exp $
+# $OpenBSD: sftp-badcmds.sh,v 1.3 2008/03/24 21:46:54 djm Exp $
# Placed in the Public Domain.
tid="sftp invalid commands"
@@ -45,17 +45,6 @@ echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
|| fail "rename nonexist failed"
test -f ${COPY}.1 && fail "file exists after rename nonexistent"
-rm -f ${COPY} ${COPY}.1
-cp $DATA $COPY
-cp $DATA2 ${COPY}.1
-verbose "$tid: rename target exists"
-echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
- || fail "rename target exists failed"
-test -f ${COPY} || fail "oldname missing after rename target exists"
-test -f ${COPY}.1 || fail "newname missing after rename target exists"
-cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists"
-cmp $DATA2 ${COPY}.1 >/dev/null 2>&1 || fail "corrupted newname after rename target exists"
-
rm -rf ${COPY} ${COPY}.dd
cp $DATA $COPY
mkdir ${COPY}.dd