diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-05-17 03:45:22 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-05-17 06:41:39 +0200 |
| commit | b88b690e99145a021fc1a1a116a11e0bce0594e7 (patch) | |
| tree | d6d0862ad3b7e17843daf5bbe8980fb28efb8d1f /regress | |
| parent | upstream: Since ssh-agent(1) is only readable by root by now, use (diff) | |
| download | openssh-b88b690e99145a021fc1a1a116a11e0bce0594e7.tar.xz openssh-b88b690e99145a021fc1a1a116a11e0bce0594e7.zip | |
upstream: allow overriding the sshd-session binary path
OpenBSD-Regress-ID: 5058cd1c4b6ca1a15474e33546142931d9f964da
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/test-exec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index eae286ebf..85e75d24b 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -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. #SUDO=sudo @@ -90,6 +90,7 @@ SSHKEYGEN=ssh-keygen SSHKEYSCAN=ssh-keyscan SFTP=sftp SFTPSERVER=/usr/libexec/openssh/sftp-server +SSHD_SESSION=/usr/libexec/sshd-session SCP=scp # Set by make_tmpdir() on demand (below). @@ -115,6 +116,9 @@ NC=$OBJ/netcat if [ "x$TEST_SSH_SSH" != "x" ]; then SSH="${TEST_SSH_SSH}" fi +if [ "x$TEST_SSH_SSHD_SESSION" != "x" ]; then + SSHD_SESSION="${TEST_SSH_SSHD_SESSION}" +fi if [ "x$TEST_SSH_SSHD" != "x" ]; then SSHD="${TEST_SSH_SSHD}" fi @@ -617,6 +621,7 @@ cat << EOF > $OBJ/sshd_config AcceptEnv _XXX_TEST_* AcceptEnv _XXX_TEST Subsystem sftp $SFTPSERVER + SshdSessionPath $SSHD_SESSION EOF # This may be necessary if /usr/src and/or /usr/obj are group-writable, |