Skip to content

Commit 98f05b1

Browse files
committed
upstream: Add TEST_SSH_SSHD_ENV variable which is added to sshd's
environment. Will be used in Portable to tweak behaviour of tcmalloc's debugging. OpenBSD-Regress-ID: 67e38c3c4517ddb72c8a3549a3325a166d7bb6d6
1 parent 8cd9ed4 commit 98f05b1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

regress/test-exec.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: test-exec.sh,v 1.125 2025/03/28 05:33:30 dtucker Exp $
1+
# $OpenBSD: test-exec.sh,v 1.126 2025/03/28 05:36:24 dtucker Exp $
22
# Placed in the Public Domain.
33

44
#SUDO=sudo
@@ -884,7 +884,7 @@ fi
884884
# create a proxy version of the client config
885885
(
886886
cat $OBJ/ssh_config
887-
echo proxycommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy
887+
echo proxycommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${TEST_SSH_SSHD_ENV} ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy
888888
) > $OBJ/ssh_proxy
889889

890890
# check proxy config
@@ -902,7 +902,7 @@ start_sshd ()
902902
# start sshd
903903
logfile="${TEST_SSH_LOGDIR}/sshd.`$OBJ/timestamp`.$$.log"
904904
$SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"
905-
$SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" \
905+
$SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" ${TEST_SSH_SSHD_ENV} \
906906
${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE
907907

908908
trace "wait for sshd"

0 commit comments

Comments
 (0)