- 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@

2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ae05fc84c..7250dd68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
    - dtucker@cvs.openbsd.org 2004/06/22 22:42:02
      [regress/envpass.sh]
      Add quoting for test -z; ok markus@
+   - 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@
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1378,4 +1382,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3434 2004/06/22 23:23:58 dtucker Exp $
+$Id: ChangeLog,v 1.3435 2004/06/22 23:25:02 dtucker Exp $
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"