tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Add TEST_SSH_MODULI_FILE variable to allow overriding of the 

moduli file used during the test run.

OpenBSD-Regress-ID: be10f785263120edb64fc87db0e0d6570a10220a
This commit is contained in:
dtucker@openbsd.org 2021-03-13 01:52:16 +00:00 committed by Darren Tucker
parent 82fef71e20
commit 721948e674
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
regress/test-exec.sh
View File

@ -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. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -470,7 +470,7 @@ EOF
# but if you aren't careful with permissions then the unit tests could # but if you aren't careful with permissions then the unit tests could
# be abused to locally escalate privileges. # be abused to locally escalate privileges.
if [ ! -z "$TEST_SSH_UNSAFE_PERMISSIONS" ]; then if [ ! -z "$TEST_SSH_UNSAFE_PERMISSIONS" ]; then
echo "StrictModes no" >> $OBJ/sshd_config echo " StrictModes no" >> $OBJ/sshd_config
else else
# check and warn if excessive permissions are likely to cause failures. # check and warn if excessive permissions are likely to cause failures.
unsafe="" unsafe=""
@ -498,6 +498,11 @@ EOD
fi fi
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 if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then
trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS" trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS"
echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config