diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 08:06:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-21 19:08:37 +1100 |
commit | f8c11461aa6db168fc5e7eeae448b4cbbf59642a (patch) | |
tree | b648fa49d456d2a0f2285fe251800e8ed88bd74f /regress/test-exec.sh | |
parent | b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0 (diff) |
upstream: pass SSH_SK_HELPER explicitly past $SUDO to avoid it getting
cleared; with dtucker@
OpenBSD-Regress-ID: 03178a0580324bf0dff28f7eac6c3edbc5407f8e
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 03dab2031..b448192e1 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.69 2019/12/16 02:39:05 djm Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.70 2020/01/21 08:06:27 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -598,7 +598,7 @@ fi | |||
598 | # create a proxy version of the client config | 598 | # create a proxy version of the client config |
599 | ( | 599 | ( |
600 | cat $OBJ/ssh_config | 600 | cat $OBJ/ssh_config |
601 | echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy | 601 | 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 |
602 | ) > $OBJ/ssh_proxy | 602 | ) > $OBJ/ssh_proxy |
603 | 603 | ||
604 | # check proxy config | 604 | # check proxy config |
@@ -608,7 +608,8 @@ start_sshd () | |||
608 | { | 608 | { |
609 | # start sshd | 609 | # start sshd |
610 | $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" | 610 | $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" |
611 | $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE | 611 | $SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" \ |
612 | ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE | ||
612 | 613 | ||
613 | trace "wait for sshd" | 614 | trace "wait for sshd" |
614 | i=0; | 615 | i=0; |