summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/sftp-cmds.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f6c39be20..5cb04951e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
31 [multiplex.sh forwarding.sh] 31 [multiplex.sh forwarding.sh]
32 append to rather than truncate test log; bz#2013 from openssh AT 32 append to rather than truncate test log; bz#2013 from openssh AT
33 roumenpetrov.info 33 roumenpetrov.info
34 - djm@cvs.openbsd.org 2012/06/01 00:52:52
35 [sftp-cmds.sh]
36 don't delete .* on cleanup due to unintended env expansion; pointed out in
37 bz#2014 by openssh AT roumenpetrov.info
34 38
3520120628 3920120628
36 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 40 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 1c67b6476..d10d01a31 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: sftp-cmds.sh,v 1.11 2010/12/04 00:21:19 djm Exp $ 1# $OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4# XXX - TODO: 4# XXX - TODO:
@@ -40,7 +40,7 @@ SPACECOPY_ARG="${COPY}\ this\ has\ spaces.txt"
40# File with glob metacharacters 40# File with glob metacharacters
41GLOBMETACOPY="${COPY} [metachar].txt" 41GLOBMETACOPY="${COPY} [metachar].txt"
42 42
43rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* 43rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
44mkdir ${COPY}.dd 44mkdir ${COPY}.dd
45 45
46verbose "$tid: lls" 46verbose "$tid: lls"
@@ -242,7 +242,7 @@ verbose "$tid: lchdir"
242echo "lchdir ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ 242echo "lchdir ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
243 || fail "lchdir failed" 243 || fail "lchdir failed"
244 244
245rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* 245rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
246rm -rf ${QUOTECOPY} "$SPACECOPY" "$GLOBMETACOPY" 246rm -rf ${QUOTECOPY} "$SPACECOPY" "$GLOBMETACOPY"
247 247
248 248