From ff32d7c9d20d42db364525d92c27a7c7491caf0d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 30 Jun 2012 15:04:13 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2012/06/01 00:52:52     
 [regress/sftp-cmds.sh]      don't delete .* on cleanup due to unintended env
 expansion; pointed out in      bz#2014 by openssh AT roumenpetrov.info

---
 ChangeLog            | 4 ++++
 regress/sftp-cmds.sh | 6 +++---
 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 @@
      [multiplex.sh forwarding.sh]
      append to rather than truncate test log; bz#2013 from openssh AT
      roumenpetrov.info
+   - djm@cvs.openbsd.org 2012/06/01 00:52:52
+     [sftp-cmds.sh]
+     don't delete .* on cleanup due to unintended env expansion; pointed out in
+     bz#2014 by openssh AT roumenpetrov.info
 
 20120628
  - (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 @@
-#	$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: 
@@ -40,7 +40,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"
@@ -242,7 +242,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"