From e826a8c9d9ea8de6696ca95825d69cf02e1954d6 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 18 Jun 2004 01:23:03 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2004/06/17 14:53:27     
 [regress/multiplex.sh]      shared connection env passing regress test

---
 ChangeLog            |  5 ++++-
 regress/multiplex.sh | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b74a0bf7..53882b05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
      [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5]
      Add option for confirmation (ControlMaster=ask) via ssh-askpass before 
      opening shared connections; ok markus@
+   - djm@cvs.openbsd.org 2004/06/17 14:53:27
+     [regress/multiplex.sh]
+     shared connection env passing regress test
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1280,4 +1283,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.3406 2004/06/17 15:19:03 djm Exp $
+$Id: ChangeLog,v 1.3407 2004/06/17 15:23:03 djm Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 8605d5e0b..c19c0fe17 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.5 2004/06/17 06:19:06 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.6 2004/06/17 14:53:27 djm Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -11,8 +11,17 @@ COPY=$OBJ/ls.copy
 start_sshd
 
 trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 120
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST"  -f somehost \
+	sleep 120
 
+verbose "test $tid: envpass"
+trace "env passing over multiplexed connection"
+_XXX_TEST=blah ${SSH} -S$CTL otherhost '[ "x$_XXX_TEST" = "xblah" ]'
+if [ $? -ne 0 ]; then
+	fail "environment not found"
+fi
+
+verbose "test $tid: transfer"
 rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}