]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Set sshd environment variables during sshd test run too.
authordtucker@openbsd.org <dtucker@openbsd.org>
Fri, 28 Mar 2025 05:41:15 +0000 (05:41 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Fri, 28 Mar 2025 06:12:54 +0000 (17:12 +1100)
OpenBSD-Regress-ID: 50cb325d92c390a2909662c901f6ac5d80b6f74d

regress/test-exec.sh

index 25c46c2725f21730e62f667f3f52068c725c3e39..8a00c729cf674b9cdb7d70627d8eb2becfebcd2d 100644 (file)
@@ -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