Skip to content

Commit 8460aaa

Browse files
committed
upstream: Add TEST_SSH_SSHD_ENV to sshd lines here too.
OpenBSD-Regress-ID: 045f2c88b42d694b404db51c5de5eca20d748ff1
1 parent 5e60f59 commit 8460aaa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

regress/agent-restrict.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: agent-restrict.sh,v 1.6 2023/03/01 09:29:32 dtucker Exp $
1+
# $OpenBSD: agent-restrict.sh,v 1.7 2025/03/28 21:45:55 dtucker Exp $
22
# Placed in the Public Domain.
33

44
tid="agent restrictions"
@@ -39,14 +39,14 @@ Host host_$h
3939
Hostname host_$h
4040
HostkeyAlias host_$h
4141
IdentityFile $OBJ/user_$h
42-
ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
42+
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
4343
_EOF
4444
# Variant with no specified keys.
4545
cat << _EOF >> $OBJ/ssh_proxy_noid
4646
Host host_$h
4747
Hostname host_$h
4848
HostkeyAlias host_$h
49-
ProxyCommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" ${OBJ}/sshd-log-wrapper.sh -i -f $OBJ/sshd_proxy_host_$h
49+
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
5050
_EOF
5151
done
5252
cat $OBJ/ssh_proxy.bak >> $OBJ/ssh_proxy

0 commit comments

Comments
 (0)