[openssh-commits] [openssh] 01/08: upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
git+noreply at mindrot.org
git+noreply at mindrot.org
Sat Mar 13 13:55:05 AEDT 2021
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit 721948e67488767df0fa0db71ff2578ee2bb9210
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date: Sat Mar 13 01:52:16 2021 +0000
upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the
moduli file used during the test run.
OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a
---
regress/test-exec.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 11475938..4d04e04b 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: test-exec.sh,v 1.77 2021/02/17 03:59:00 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.78 2021/03/13 01:52:16 dtucker Exp $
# Placed in the Public Domain.
#SUDO=sudo
@@ -470,7 +470,7 @@ EOF
# but if you aren't careful with permissions then the unit tests could
# be abused to locally escalate privileges.
if [ ! -z "$TEST_SSH_UNSAFE_PERMISSIONS" ]; then
- echo "StrictModes no" >> $OBJ/sshd_config
+ echo " StrictModes no" >> $OBJ/sshd_config
else
# check and warn if excessive permissions are likely to cause failures.
unsafe=""
@@ -498,6 +498,11 @@ EOD
fi
fi
+if [ ! -z "$TEST_SSH_MODULI_FILE" ]; then
+ trace "adding modulifile='$TEST_SSH_MODULI_FILE' to sshd_config"
+ echo " ModuliFile '$TEST_SSH_MODULI_FILE'" >> $OBJ/sshd_config
+fi
+
if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then
trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS"
echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list