diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-04-14 23:21:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-04-15 11:16:12 +1000 |
commit | 076787702418985a2cc6808212dc28ce7afc01f0 (patch) | |
tree | 3680988ea441b7d8940549e2a9f50dce17be06a3 /regress | |
parent | dc7990be865450574c7940c9880567f5d2555b37 (diff) |
upstream commit
add test knob and warning for StrictModes
Upstream-Regress-ID: 8cd10952ce7898655ee58945904f2a0a3bdf7682
Diffstat (limited to 'regress')
-rw-r--r-- | regress/test-exec.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 114e129f2..d468bcf4d 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.51 2015/03/03 22:35:19 markus Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.52 2016/04/14 23:21:42 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -411,6 +411,13 @@ cat << EOF > $OBJ/sshd_config | |||
411 | Subsystem sftp $SFTPSERVER | 411 | Subsystem sftp $SFTPSERVER |
412 | EOF | 412 | EOF |
413 | 413 | ||
414 | # This may be necessary if /usr/src and/or /usr/obj are group-writable, | ||
415 | # but if you aren't careful with permissions then the unit tests could | ||
416 | # be abused to locally escalate privileges. | ||
417 | if [ ! -z "$TEST_SSH_UNSAFE_PERMISSIONS" ]; then | ||
418 | echo "StrictModes no" >> $OBJ/sshd_config | ||
419 | fi | ||
420 | |||
414 | if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then | 421 | if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then |
415 | trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS" | 422 | trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS" |
416 | echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config | 423 | echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config |