From: dtucker@openbsd.org Date: Fri, 28 Mar 2025 05:41:15 +0000 (+0000) Subject: upstream: Set sshd environment variables during sshd test run too. X-Git-Tag: V_10_0_P1~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd36869dfb4b770cc9e6a345c04a585a0955aec;p=thirdparty%2Fopenssh-portable.git upstream: Set sshd environment variables during sshd test run too. OpenBSD-Regress-ID: 50cb325d92c390a2909662c901f6ac5d80b6f74d --- diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 25c46c272..8a00c729c 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.126 2025/03/28 05:36:24 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.127 2025/03/28 05:41:15 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -901,7 +901,8 @@ start_sshd () PIDFILE=$OBJ/pidfile # start sshd logfile="${TEST_SSH_LOGDIR}/sshd.`$OBJ/timestamp`.$$.log" - $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" + $SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" ${TEST_SSH_SSHD_ENV} \ + ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" $SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" ${TEST_SSH_SSHD_ENV} \ ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE