From 3154358d66c99636021e7f1b9555064d9cc38e00 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 14 Dec 2005 15:39:20 +1100 Subject: - 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@ --- regress/scp-ssh-wrapper.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'regress/scp-ssh-wrapper.sh') 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 -- cgit v1.2.3 From 15a815bb6476ddba55508b177773c9c99c6fe46e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 31 Jan 2006 22:03:11 +1100 Subject: - dtucker@cvs.openbsd.org 2005/12/14 04:36:39 [regress/scp-ssh-wrapper.sh] Fix assumption about how many args scp will pass; ok djm@ NB. ID sync only, we already had this --- ChangeLog | 6 +++++- regress/scp-ssh-wrapper.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'regress/scp-ssh-wrapper.sh') diff --git a/ChangeLog b/ChangeLog index b9e4e2a50..377e6242b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,10 @@ [regress/agent-getpeereid.sh] all other scripts in this dir use $SUDO, not 'sudo', so pull this even ok markus@ + - dtucker@cvs.openbsd.org 2005/12/14 04:36:39 + [regress/scp-ssh-wrapper.sh] + Fix assumption about how many args scp will pass; ok djm@ + NB. ID sync only, we already had this 20060129 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the @@ -3781,4 +3785,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.4107 2006/01/31 11:02:16 djm Exp $ +$Id: ChangeLog,v 1.4108 2006/01/31 11:03:11 djm Exp $ diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh index 594337d11..d1005a995 100644 --- a/regress/scp-ssh-wrapper.sh +++ b/regress/scp-ssh-wrapper.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: scp-ssh-wrapper.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $ +# $OpenBSD: scp-ssh-wrapper.sh,v 1.2 2005/12/14 04:36:39 dtucker Exp $ # Placed in the Public Domain. printname () { -- cgit v1.2.3