diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-11-25 02:56:50 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-11-25 02:56:50 +0000 |
| commit | dbe3343329abc0b6d03e72d6b795a23d2dceaca6 (patch) | |
| tree | 110ae6890702d5275b431947dc3115c72f0a82ba /regress/usr.bin/ssh | |
| parent | c5318258fc0df2adf983a1874ee00523808681c2 (diff) | |
Reverse args to sshd-log-wrapper. Matches change in portable, where it
allows sshd do be optionally run under Valgrind.
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/integrity.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/sshd-log-wrapper.sh | 10 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 6 |
3 files changed, 9 insertions, 11 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh index 98dba772f17..c8d23bbf878 100644 --- a/regress/usr.bin/ssh/integrity.sh +++ b/regress/usr.bin/ssh/integrity.sh @@ -1,4 +1,4 @@ -# $OpenBSD: integrity.sh,v 1.18 2016/03/04 02:48:06 dtucker Exp $ +# $OpenBSD: integrity.sh,v 1.19 2016/11/25 02:56:49 dtucker Exp $ # Placed in the Public Domain. tid="integrity" @@ -15,7 +15,7 @@ macs=`${SSH} -Q mac` macs="$macs `${SSH} -Q cipher-auth`" # sshd-command for proxy (see test-exec.sh) -cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" +cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" for m in $macs; do trace "test $tid: mac $m" diff --git a/regress/usr.bin/ssh/sshd-log-wrapper.sh b/regress/usr.bin/ssh/sshd-log-wrapper.sh index a9386be4d1c..29dc44aa0b5 100644 --- a/regress/usr.bin/ssh/sshd-log-wrapper.sh +++ b/regress/usr.bin/ssh/sshd-log-wrapper.sh @@ -1,13 +1,11 @@ #!/bin/sh -# $OpenBSD: sshd-log-wrapper.sh,v 1.3 2013/04/07 02:16:03 dtucker Exp $ +# $OpenBSD: sshd-log-wrapper.sh,v 1.4 2016/11/25 02:56:49 dtucker Exp $ # Placed in the Public Domain. # # simple wrapper for sshd proxy mode to catch stderr output -# sh sshd-log-wrapper.sh /path/to/sshd /path/to/logfile +# sh sshd-log-wrapper.sh /path/to/logfile /path/to/sshd [args...] -sshd=$1 -log=$2 -shift +log=$1 shift -exec $sshd -E$log $@ +exec "$@" -E$log diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index b390495709e..3982646d9aa 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.55 2016/11/25 02:49:18 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.56 2016/11/25 02:56:49 dtucker Exp $ # Placed in the Public Domain. USER=`id -un` @@ -387,7 +387,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy - echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy + echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy REGRESS_INTEROP_PUTTY=yes fi @@ -395,7 +395,7 @@ fi # create a proxy version of the client config ( cat $OBJ/ssh_config - echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy + echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy ) > $OBJ/ssh_proxy # check proxy config |