upstream: regress support for split sshd-auth binary

OpenBSD-Regress-ID: df7d18a87b475f70004770f0f4e404adba5f6ab7

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 7afc2807299cde050a403b22af35b86f522711d1..7a078edf6133282f8b80cc14264670003509ccfd 100644 (file)
--- 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