Hi Darren,
On Mar 8 10:07, Darren Tucker wrote:
> On Fri, Mar 08, 2024 at 08:53:45AM +1100, Darren Tucker wrote:
> > On Fri, 8 Mar 2024 at 06:59, Corinna Vinschen <vinschen@xxxxxxxxxx> wrote:
> [...]
> > > Having said that, can this test be changed to be independent of the
> > > user's long shell?
> >
> > Yes we should be able to change to something that invokes
> > ${TEST_SHELL} -c "[whatever]", although it might take a couple of
> > attempts to get the quoting right. Lemme have a try...
>
> I think this should do it, and it turned out to be simpler than I
> thought. Can you confirm it works for you?
>
> Thanks.
>
> Index: dynamic-forward.sh
> ===================================================================
> RCS file: /export/cvs/src/regress/usr.bin/ssh/dynamic-forward.sh,v
> diff -u -p -r1.16 dynamic-forward.sh
> --- dynamic-forward.sh 11 Jan 2023 00:51:27 -0000 1.16
> +++ dynamic-forward.sh 7 Mar 2024 23:03:25 -0000
> @@ -51,9 +51,9 @@ check_socks() {
> for s in 4 5; do
> for h in 127.0.0.1 localhost; do
> trace "testing ssh socks version $s host $h (-$direction)"
> - ${REAL_SSH} -q -F $OBJ/ssh_config \
> - -o "ProxyCommand ${proxycmd}${s} $h $PORT 2>/dev/null" \
> - somehost cat ${DATA} > ${COPY}
> + ${REAL_SSH} -q -F $OBJ/ssh_config -o \
> + "ProxyCommand ${TEST_SHELL} -c '${proxycmd}${s} $h $PORT 2>/dev/null'" \
> + somehost cat ${DATA} > ${COPY}
> r=$?
> if [ "x$expect_success" = "xY" ] ; then
> if [ $r -ne 0 ] ; then
This works nicely. Thanks!
Corinna
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@xxxxxxxxxxx
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
