2 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e1418db82..0eb979374 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 8e4314773..594337d11 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