From 6223eea5962535f2efe9789a9bc19ecca1539713 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 23 Jun 2004 09:25:02 +1000 Subject: - dtucker@cvs.openbsd.org 2004/06/22 22:45:52 [regress/test-exec.sh] 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@ --- regress/test-exec.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'regress/test-exec.sh') diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 296f26eb3..a184c16d1 100644 --- a/regress/test-exec.sh +++ b/regress/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 @@ -172,6 +172,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 @@ -197,6 +202,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" -- cgit v1.2.3