Skip to content

Commit

Permalink
upstream: regress support for split sshd-auth binary
Browse files Browse the repository at this point in the history
OpenBSD-Regress-ID: df7d18a87b475f70004770f0f4e404adba5f6ab7
  • Loading branch information
djmdjm committed Oct 14, 2024
1 parent 4617410 commit 7485620
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion regress/test-exec.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.119 2024/06/20 08:18:34 dtucker Exp $
# $OpenBSD: test-exec.sh,v 1.120 2024/10/14 03:02:08 djm Exp $
# Placed in the Public Domain.

#SUDO=sudo
Expand Down Expand Up @@ -91,6 +91,7 @@ SSHKEYSCAN=ssh-keyscan
SFTP=sftp
SFTPSERVER=/usr/libexec/openssh/sftp-server
SSHD_SESSION=/usr/libexec/sshd-session
SSHD_AUTH=/usr/libexec/sshd-auth
SCP=scp

# Set by make_tmpdir() on demand (below).
Expand Down Expand Up @@ -119,6 +120,9 @@ fi
if [ "x$TEST_SSH_SSHD_SESSION" != "x" ]; then
SSHD_SESSION="${TEST_SSH_SSHD_SESSION}"
fi
if [ "x$TEST_SSH_SSHD_AUTH" != "x" ]; then
SSHD_AUTH="${TEST_SSH_SSHD_AUTH}"
fi
if [ "x$TEST_SSH_SSHD" != "x" ]; then
SSHD="${TEST_SSH_SSHD}"
fi
Expand Down Expand Up @@ -621,6 +625,7 @@ cat << EOF > $OBJ/sshd_config
AcceptEnv _XXX_TEST
Subsystem sftp $SFTPSERVER
SshdSessionPath $SSHD_SESSION
SshdAuthPath $SSHD_AUTH
PerSourcePenalties no
EOF

Expand Down

0 comments on commit 7485620

Please sign in to comment.