tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: allow overriding the sshd-session binary path 

OpenBSD-Regress-ID: 5058cd1c4b6ca1a15474e33546142931d9f964da
This commit is contained in:
djm@openbsd.org 2024-05-17 01:45:22 +00:00 committed by Damien Miller
parent a68f80f251
commit b88b690e99
No known key found for this signature in database
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.110 2024/04/03 06:01:11 anton Exp $ # $OpenBSD: test-exec.sh,v 1.111 2024/05/17 01:45:22 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -90,6 +90,7 @@ SSHKEYGEN=ssh-keygen
SSHKEYSCAN=ssh-keyscan SSHKEYSCAN=ssh-keyscan
SFTP=sftp SFTP=sftp
SFTPSERVER=/usr/libexec/openssh/sftp-server SFTPSERVER=/usr/libexec/openssh/sftp-server
SSHD_SESSION=/usr/libexec/sshd-session
SCP=scp SCP=scp
# Set by make_tmpdir() on demand (below). # Set by make_tmpdir() on demand (below).
@ -115,6 +116,9 @@ NC=$OBJ/netcat
if [ "x$TEST_SSH_SSH" != "x" ]; then if [ "x$TEST_SSH_SSH" != "x" ]; then
SSH="${TEST_SSH_SSH}" SSH="${TEST_SSH_SSH}"
fi fi
if [ "x$TEST_SSH_SSHD_SESSION" != "x" ]; then
SSHD_SESSION="${TEST_SSH_SSHD_SESSION}"
fi
if [ "x$TEST_SSH_SSHD" != "x" ]; then if [ "x$TEST_SSH_SSHD" != "x" ]; then
SSHD="${TEST_SSH_SSHD}" SSHD="${TEST_SSH_SSHD}"
fi fi
@ -617,6 +621,7 @@ cat << EOF > $OBJ/sshd_config
AcceptEnv _XXX_TEST_* AcceptEnv _XXX_TEST_*
AcceptEnv _XXX_TEST AcceptEnv _XXX_TEST
Subsystem sftp $SFTPSERVER Subsystem sftp $SFTPSERVER
SshdSessionPath $SSHD_SESSION
EOF EOF
# This may be necessary if /usr/src and/or /usr/obj are group-writable, # This may be necessary if /usr/src and/or /usr/obj are group-writable,