summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-12-14 15:39:20 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-12-14 15:39:20 +1100
commit3154358d66c99636021e7f1b9555064d9cc38e00 (patch)
treec993c3d52d733e53f22d2f5a379fbbf110429a31
parent62a31c9fd06506ab976a4dc2050882f29ab24693 (diff)
- dtucker@cvs.openbsd.org 2005/12/30 04:36:39
[regress/scp-ssh-wrapper.sh] Fix assumption about how many args scp will pass; ok djm@
-rw-r--r--ChangeLog8
-rw-r--r--regress/scp-ssh-wrapper.sh9
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e1418db8..0eb97937 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051214
+ - (dtucker) OpenBSD CVS Sync (regress/)
+ - dtucker@cvs.openbsd.org 2005/12/30 04:36:39
+ [regress/scp-ssh-wrapper.sh]
+ Fix assumption about how many args scp will pass; ok djm@
+
20051213
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2005/11/30 11:18:27
@@ -3452,4 +3458,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4027 2005/12/13 09:44:13 djm Exp $
+$Id: ChangeLog,v 1.4028 2005/12/14 04:39:20 dtucker Exp $
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh
index 8e431477..594337d1 100644
--- a/regress/scp-ssh-wrapper.sh
+++ b/regress/scp-ssh-wrapper.sh
@@ -16,8 +16,11 @@ printname () {
done
}
-# discard first 5 args
-shift; shift; shift; shift; shift
+# Discard all but last argument. We use arg later.
+while test "$1" != ""; do
+ arg="$1"
+ shift
+done
BAD="../../../../../../../../../../../../../${DIR}/dotpathdir"
@@ -49,6 +52,6 @@ badserver_4)
echo "X"
;;
*)
- exec $1
+ exec $arg
;;
esac