diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2012-06-01 00:52:53 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2012-06-01 00:52:53 +0000 |
commit | 0b56d4a475f18143966b4e53149cec73a7bee2e1 (patch) | |
tree | 888f7675bd097d4983fe7c0d837d50eb82578df1 | |
parent | 223b45f94b34e8247a0599be05c4d35093598d01 (diff) |
don't delete .* on cleanup due to unintended env expansion; pointed out in
bz#2014 by openssh AT roumenpetrov.info
-rw-r--r-- | regress/usr.bin/ssh/sftp-cmds.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/sftp-cmds.sh b/regress/usr.bin/ssh/sftp-cmds.sh index d94d348aeb5..d5ddc2d6867 100644 --- a/regress/usr.bin/ssh/sftp-cmds.sh +++ b/regress/usr.bin/ssh/sftp-cmds.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-cmds.sh,v 1.11 2010/12/04 00:21:19 djm Exp $ +# $OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $ # Placed in the Public Domain. # XXX - TODO: @@ -20,7 +20,7 @@ SPACECOPY_ARG="${COPY}\ this\ has\ spaces.txt" # File with glob metacharacters GLOBMETACOPY="${COPY} [metachar].txt" -rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* +rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 mkdir ${COPY}.dd verbose "$tid: lls" @@ -218,7 +218,7 @@ verbose "$tid: lchdir" echo "lchdir ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ || fail "lchdir failed" -rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* +rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 rm -rf ${QUOTECOPY} "$SPACECOPY" "$GLOBMETACOPY" |