diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2020-01-21 08:06:28 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2020-01-21 08:06:28 +0000 |
| commit | f970e6847c8ee1782e1ae73558c80beff1ca27d3 (patch) | |
| tree | 8443ad13e58ba1317b6f2f8012876ed8f73eaa0d /regress | |
| parent | 2131c319c4a7db189bc6d85fcb20107cbab8440f (diff) | |
pass SSH_SK_HELPER explicitly past $SUDO to avoid it getting cleared;
with dtucker@
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/integrity.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh index 062a8cfd6bf..83d2705a632 100644 --- a/regress/usr.bin/ssh/integrity.sh +++ b/regress/usr.bin/ssh/integrity.sh @@ -1,4 +1,4 @@ -# $OpenBSD: integrity.sh,v 1.23 2017/04/30 23:34:55 djm Exp $ +# $OpenBSD: integrity.sh,v 1.24 2020/01/21 08:06:27 djm Exp $ # Placed in the Public Domain. tid="integrity" @@ -13,7 +13,7 @@ macs=`${SSH} -Q mac` macs="$macs `${SSH} -Q cipher-auth`" # sshd-command for proxy (see test-exec.sh) -cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" +cmd="$SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" 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/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index d8229b07ff6..3bd469d4661 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.69 2019/12/16 02:39:05 djm Exp $ +# $OpenBSD: test-exec.sh,v 1.70 2020/01/21 08:06:27 djm Exp $ # Placed in the Public Domain. USER=`id -un` @@ -432,7 +432,7 @@ fi # create a proxy version of the client config ( cat $OBJ/ssh_config - echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy + echo proxycommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy ) > $OBJ/ssh_proxy # check proxy config @@ -442,7 +442,8 @@ start_sshd () { # start sshd $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" - $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE + $SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" \ + ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE trace "wait for sshd" i=0; |