upstream: Add TEST_SSH_SSHD_ENV to sshd lines here too.

OpenBSD-Regress-ID: 045f2c88b42d694b404db51c5de5eca20d748ff1

diff --git a/regress/agent-restrict.sh b/regress/agent-restrict.sh
index 62cea85225e7c39ab5a1d452c47b576a3ab3b460..057856f1bbdf25d88424405b5d2278f4388e2464 100644 (file)
--- a/regress/agent-restrict.sh
+++ b/regress/agent-restrict.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: agent-restrict.sh,v 1.6 2023/03/01 09:29:32 dtucker Exp $
+#      $OpenBSD: agent-restrict.sh,v 1.7 2025/03/28 21:45:55 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="agent restrictions"
@@ -39,14 +39,14 @@ Host host_$h
        Hostname host_$h
        HostkeyAlias host_$h
        IdentityFile $OBJ/user_$h
-       ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
+       ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${TEST_SSH_SSHD_ENV} ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
 _EOF
        # Variant with no specified keys.
        cat << _EOF >> $OBJ/ssh_proxy_noid
 Host host_$h
        Hostname host_$h
        HostkeyAlias host_$h
-       ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
+       ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${TEST_SSH_SSHD_ENV} ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
 _EOF
 done
 cat $OBJ/ssh_proxy.bak >> $OBJ/ssh_proxy