diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/sftp-badcmds.sh | 13 |
2 files changed, 6 insertions, 13 deletions
@@ -46,6 +46,10 @@ | |||
46 | - djm@cvs.openbsd.org 2008/03/27 00:16:49 | 46 | - djm@cvs.openbsd.org 2008/03/27 00:16:49 |
47 | [version.h] | 47 | [version.h] |
48 | openssh-4.9 | 48 | openssh-4.9 |
49 | - djm@cvs.openbsd.org 2008/03/24 21:46:54 | ||
50 | [regress/sftp-badcmds.sh] | ||
51 | disable no-replace rename test now that we prefer a POSIX rename; spotted | ||
52 | by dkrause@ | ||
49 | 53 | ||
50 | 20080315 | 54 | 20080315 |
51 | - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are | 55 | - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are |
@@ -3814,4 +3818,4 @@ | |||
3814 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3818 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3815 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3819 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3816 | 3820 | ||
3817 | $Id: ChangeLog,v 1.4890 2008/03/27 00:18:13 djm Exp $ | 3821 | $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 eac189aaf..b48b1cb01 100644 --- a/regress/sftp-badcmds.sh +++ b/regress/sftp-badcmds.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-badcmds.sh,v 1.2 2003/05/15 04:07:12 mouring Exp $ | 1 | # $OpenBSD: sftp-badcmds.sh,v 1.3 2008/03/24 21:46:54 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="sftp invalid commands" | 4 | tid="sftp invalid commands" |
@@ -45,17 +45,6 @@ echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | |||
45 | || fail "rename nonexist failed" | 45 | || fail "rename nonexist failed" |
46 | test -f ${COPY}.1 && fail "file exists after rename nonexistent" | 46 | test -f ${COPY}.1 && fail "file exists after rename nonexistent" |
47 | 47 | ||
48 | rm -f ${COPY} ${COPY}.1 | ||
49 | cp $DATA $COPY | ||
50 | cp $DATA2 ${COPY}.1 | ||
51 | verbose "$tid: rename target exists" | ||
52 | echo "rename $COPY ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | ||
53 | || fail "rename target exists failed" | ||
54 | test -f ${COPY} || fail "oldname missing after rename target exists" | ||
55 | test -f ${COPY}.1 || fail "newname missing after rename target exists" | ||
56 | cmp $DATA ${COPY} >/dev/null 2>&1 || fail "corrupted oldname after rename target exists" | ||
57 | cmp $DATA2 ${COPY}.1 >/dev/null 2>&1 || fail "corrupted newname after rename target exists" | ||
58 | |||
59 | rm -rf ${COPY} ${COPY}.dd | 48 | rm -rf ${COPY} ${COPY}.dd |
60 | cp $DATA $COPY | 49 | cp $DATA $COPY |
61 | mkdir ${COPY}.dd | 50 | mkdir ${COPY}.dd |