summaryrefslogtreecommitdiffstats
path: root/regress
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-10-14 05:02:08 +0200
committerDamien Miller <djm@mindrot.org>2024-10-14 05:03:07 +0200
commit74856204a353a187dc6e7706c6cf84b7f14d775d (patch)
tree1174fab4223a77ce2432264d0bb188bab823d1a3 /regress
parentupstream: test some more Match syntax, including criteria=arg and (diff)
downloadopenssh-74856204a353a187dc6e7706c6cf84b7f14d775d.tar.xz
openssh-74856204a353a187dc6e7706c6cf84b7f14d775d.zip
upstream: regress support for split sshd-auth binary
OpenBSD-Regress-ID: df7d18a87b475f70004770f0f4e404adba5f6ab7
Diffstat (limited to 'regress')
-rw-r--r--regress/test-exec.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 7afc28072..7a078edf6 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -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
@@ -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).
@@ -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
@@ -621,6 +625,7 @@ cat << EOF > $OBJ/sshd_config
AcceptEnv _XXX_TEST
Subsystem sftp $SFTPSERVER
SshdSessionPath $SSHD_SESSION
+ SshdAuthPath $SSHD_AUTH
PerSourcePenalties no
EOF