diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2004-06-22 22:45:53 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2004-06-22 22:45:53 +0000 |
| commit | 07c4dcafde1200024ef116c65fe8b50834bef6a7 (patch) | |
| tree | cf45c857620a48dce5422e8722501da749fc9562 /regress/usr.bin | |
| parent | 7b28d89ec8fbebacc0083fb8ebb29b54dc565852 (diff) | |
Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding
arbitary options to sshd_config and ssh_config during tests. ok markus@
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index c9fba66cce9..18357a5fbe1 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.19 2004/06/13 15:16:54 djm Exp $ +# $OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $ # Placed in the Public Domain. PORT=4242 @@ -139,6 +139,11 @@ cat << EOF > $OBJ/sshd_config Subsystem sftp $SFTPSERVER EOF +if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then + trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS" + echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config +fi + # server config for proxy connects cp $OBJ/sshd_config $OBJ/sshd_proxy @@ -165,6 +170,11 @@ Host * StrictHostKeyChecking yes EOF +if [ ! -z "$TEST_SSH_SSH_CONFOPTS" ]; then + trace "adding ssh_config option $TEST_SSH_SSHD_CONFOPTS" + echo "$TEST_SSH_SSH_CONFOPTS" >> $OBJ/ssh_config +fi + rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER trace "generate keys" |