From 9929d1f6666f49ed3ea60769913e40b2bb6e3f1a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 19 Apr 2004 22:01:37 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/02/29 22:04:45     
 [regress/login-timeout.sh]      Use sudo when restarting daemon during test. 
 ok markus@

---
 regress/login-timeout.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index dfc6e6b44..43cce7efe 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
+#	$OpenBSD: login-timeout.sh,v 1.2 2004/02/29 22:04:45 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="connect after login grace timeout"
@@ -15,7 +15,7 @@ if [ $? -ne 0 ]; then
 	fail "ssh connect after login grace timeout failed with privsep"
 fi
 
-kill `cat $PIDFILE`
+$SUDO kill `cat $PIDFILE`
 
 trace "test login grace without privsep"
 echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config
-- 
cgit v1.2.3


From 0a74ae7c1447a86a56d75b2093b322ed1fb4d552 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 19 Apr 2004 22:04:21 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/03/08 10:17:12     
 [regress/login-timeout.sh]      Missing OBJ, from tim@.  ok markus@ (Already
 fixed, ID sync only)

---
 ChangeLog                | 5 ++++-
 regress/login-timeout.sh | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index d830ea30b..6e50e072c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - dtucker@cvs.openbsd.org 2004/02/29 22:04:45
      [regress/login-timeout.sh]
      Use sudo when restarting daemon during test.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/03/08 10:17:12
+     [regress/login-timeout.sh]
+     Missing OBJ, from tim@.  ok markus@ (Already fixed, ID sync only)
 
 20040418
  - (dtucker) [auth-pam.c] Log username and source host for failed PAM
@@ -988,4 +991,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.3317 2004/04/19 12:01:37 dtucker Exp $
+$Id: ChangeLog,v 1.3318 2004/04/19 12:04:21 dtucker Exp $
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index 43cce7efe..ce6edade5 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: login-timeout.sh,v 1.2 2004/02/29 22:04:45 dtucker Exp $
+#	$OpenBSD: login-timeout.sh,v 1.3 2004/03/08 10:17:12 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="connect after login grace timeout"
-- 
cgit v1.2.3


From 4c37ef08abc56fe883e75333f04cf2a7382fce07 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:08:56 +1000
Subject:    - djm@cvs.openbsd.org 2004/04/27 09:47:30      [regress/Makefile
 regress/test-exec.sh, added regress/envpass.sh]      regress test for
 environment passing, SendEnv & AcceptEnv options;      ok markus@

---
 ChangeLog            |  8 +++++++-
 envpass.sh           | 44 ++++++++++++++++++++++++++++++++++++++++++++
 regress/Makefile     |  3 ++-
 regress/test-exec.sh |  4 +++-
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 envpass.sh

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 024e4f219..1c6382737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
    code changes.
+ - (dtucker) OpenBSD CVS Sync regress/
+   - djm@cvs.openbsd.org 2004/04/27 09:47:30
+     [Makefile test-exec.sh]
+     regress test for environment passing, SendEnv & AcceptEnv options;
+     ok markus@
+
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1226,4 +1232,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.3388 2004/06/16 02:01:15 dtucker Exp $
+$Id: ChangeLog,v 1.3389 2004/06/16 10:08:56 dtucker Exp $
diff --git a/envpass.sh b/envpass.sh
new file mode 100644
index 000000000..67044d421
--- /dev/null
+++ b/envpass.sh
@@ -0,0 +1,44 @@
+#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	Placed in the Public Domain.
+
+tid="environment passing"
+
+# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
+
+trace "pass env, don't accept"
+verbose "test $tid: pass env, don't accept"
+_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_TEST_ENV" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "don't pass env, accept"
+verbose "test $tid: don't pass env, accept"
+${SSH} -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "pass single env, accept single env"
+verbose "test $tid: pass single env, accept single env"
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST" = "xblah" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
+trace "pass multiple env, accept multiple env"
+verbose "test $tid: pass multiple env, accept multiple env"
+_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
+    -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
diff --git a/regress/Makefile b/regress/Makefile
index cf65b3630..c7e7bb06a 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.28 2004/04/27 09:47:30 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -13,6 +13,7 @@ LTESTS= 	connect \
 		proto-version \
 		proto-mismatch \
 		exit-status \
+		envpass \
 		transfer \
 		banner \
 		rekey \
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 986d99287..a0df0e957 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.15 2004/02/24 16:56:30 markus Exp $
+#	$OpenBSD: test-exec.sh,v 1.16 2004/04/27 09:47:30 djm Exp $
 #	Placed in the Public Domain.
 
 PORT=4242
@@ -162,6 +162,8 @@ cat << EOF > $OBJ/sshd_config
 	PidFile			$PIDFILE
 	AuthorizedKeysFile	$OBJ/authorized_keys_%u
 	LogLevel		QUIET
+	AcceptEnv		_XXX_TEST_*
+	AcceptEnv		_XXX_TEST
 	StrictModes		no
 EOF
 
-- 
cgit v1.2.3


From 50433a924344b295cd34ecdbba0c6b8f6add9231 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:15:59 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/13 13:51:02     
 [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh     
 regress/scp.sh]      Add scp regression test; with & ok markus@

---
 ChangeLog                  |  6 ++--
 regress/Makefile           |  7 +++--
 regress/scp-ssh-wrapper.sh | 54 ++++++++++++++++++++++++++++++++++
 regress/scp.sh             | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 regress/test-exec.sh       | 10 +++++--
 5 files changed, 143 insertions(+), 7 deletions(-)
 create mode 100644 regress/scp-ssh-wrapper.sh
 create mode 100644 regress/scp.sh

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 1c6382737..768e09bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@
      [Makefile test-exec.sh]
      regress test for environment passing, SendEnv & AcceptEnv options;
      ok markus@
-
+   - dtucker@cvs.openbsd.org 2004/06/13 13:51:02
+     [Makefile test-exec.sh]
+     Add scp regression test; with & ok markus@
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1232,4 +1234,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.3389 2004/06/16 10:08:56 dtucker Exp $
+$Id: ChangeLog,v 1.3390 2004/06/16 10:15:59 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index c7e7bb06a..8f15f3b4d 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2004/04/27 09:47:30 djm Exp $
+#	$OpenBSD: Makefile,v 1.29 2004/06/13 13:51:02 dtucker Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -29,6 +29,7 @@ LTESTS= 	connect \
 		agent-ptrace \
 		keyscan \
 		keygen-change \
+		scp \
 		sftp \
 		sftp-cmds \
 		sftp-badcmds \
@@ -43,7 +44,9 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		ssh_config ssh_proxy sshd_config sshd_proxy \
 		rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
-		ls.copy banner.in banner.out empty.in remote_pid
+		ls.copy banner.in banner.out empty.in \
+		scp-ssh-wrapper.exe \
+		remote_pid
 
 #LTESTS +=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh
new file mode 100644
index 000000000..8e4314773
--- /dev/null
+++ b/regress/scp-ssh-wrapper.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+#       $OpenBSD: scp-ssh-wrapper.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $
+#       Placed in the Public Domain.
+
+printname () {
+	NAME=$1
+	save_IFS=$IFS
+	IFS=/
+	set -- `echo "$NAME"`
+	IFS="$save_IFS"
+	while [ $# -ge 1 ] ; do
+		if [ "x$1" != "x" ]; then
+			echo "D0755 0 $1"
+		fi
+		shift;
+	done
+}
+
+# discard first 5 args
+shift; shift; shift; shift; shift
+
+BAD="../../../../../../../../../../../../../${DIR}/dotpathdir"
+
+case "$SCPTESTMODE" in
+badserver_0)
+	echo "D0755 0 /${DIR}/rootpathdir"
+	echo "C755 2 rootpathfile"
+	echo "X"
+	;;
+badserver_1)
+	echo "D0755 0 $BAD"
+	echo "C755 2 file"
+	echo "X"
+	;;
+badserver_2)
+	echo "D0755 0 $BAD"
+	echo "C755 2 file"
+	echo "X"
+	;;
+badserver_3)
+	printname $BAD
+	echo "C755 2 file"
+	echo "X"
+	;;
+badserver_4)
+	printname $BAD
+	echo "D0755 0 .."
+	echo "C755 2 file"
+	echo "X"
+	;;
+*)
+	exec $1
+	;;
+esac
diff --git a/regress/scp.sh b/regress/scp.sh
new file mode 100644
index 000000000..2d722c70c
--- /dev/null
+++ b/regress/scp.sh
@@ -0,0 +1,73 @@
+#	$OpenBSD: scp.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $
+#	Placed in the Public Domain.
+
+tid="scp"
+
+#set -x
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+COPY2=${OBJ}/copy2
+DIR=${COPY}.dd
+DIR2=${COPY}.dd2
+
+SRC=`dirname ${SCRIPT}`
+cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.exe
+chmod 755 ${OBJ}/scp-ssh-wrapper.exe
+scpopts="-q -S ${OBJ}/scp-ssh-wrapper.exe"
+
+scpclean() {
+	rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
+	mkdir ${DIR} ${DIR2}
+}
+
+verbose "$tid: simple copy local file to remote file"
+scpclean
+$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
+cmp ${DATA} ${COPY} || fail "corrupted copy"
+
+verbose "$tid: simple copy remote file to local file"
+scpclean
+$SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed"
+cmp ${DATA} ${COPY} || fail "corrupted copy"
+
+verbose "$tid: simple copy local file to remote dir"
+scpclean
+cp ${DATA} ${COPY}
+$SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed"
+cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
+
+verbose "$tid: simple copy remote file to local dir"
+scpclean
+cp ${DATA} ${COPY}
+$SCP $scpopts somehost:${COPY} ${DIR} || fail "copy failed"
+cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
+
+verbose "$tid: recursive local dir to remote dir"
+scpclean
+cp ${DATA} ${DIR}/copy
+$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
+cmp ${DIR} ${DIR2} || fail "corrupted copy"
+
+verbose "$tid: recursive remote dir to local dir"
+scpclean
+cp ${DATA} ${DIR}/copy
+$SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
+cmp ${DIR} ${DIR2} || fail "corrupted copy"
+
+for i in 0 1 2 3 4; do
+	verbose "$tid: disallow bad server #$i"
+	SCPTESTMODE=badserver_$i
+	export DIR SCPTESTMODE
+	scpclean
+	$SCP $scpopts somehost:${DATA} ${DIR} >/dev/null 2>/dev/null
+	[ -d {$DIR}/rootpathdir ] && fail "allows dir relative to root dir"
+	[ -d ${DIR}/dotpathdir ] && fail "allows dir creation in non-recursive mode"
+
+	scpclean
+	$SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
+	[ -d ${DIR}/dotpathdir ] && fail "allows dir creation outside of subdir"
+done
+
+scpclean
+rm -f ${OBJ}/scp-ssh-wrapper.exe
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a0df0e957..c8827b631 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.16 2004/04/27 09:47:30 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.17 2004/06/13 13:51:02 dtucker Exp $
 #	Placed in the Public Domain.
 
 PORT=4242
@@ -47,6 +47,7 @@ SSHKEYGEN=ssh-keygen
 SSHKEYSCAN=ssh-keyscan
 SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
+SCP=scp
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
 	SSH="${TEST_SSH_SSH}"
@@ -72,10 +73,13 @@ fi
 if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
 	SFTPSERVER="${TEST_SSH_SFTPSERVER}"
 fi
+if [ "x$TEST_SSH_SCP" != "x" ]; then
+	SCP="${TEST_SSH_SCP}"
+fi
 
 # these should be used in tests
-export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER
-#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER
+export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
+#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
 
 # helper
 echon()
-- 
cgit v1.2.3


From e7d0583f36d060d199c44cbd16b367b0b9907333 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:22:22 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/13 15:04:08      [regress/Makefile
 regress/test-exec.sh, added regress/multiplex.sh]      regress test for
 client multiplexing; ok markus@

---
 ChangeLog            |  5 ++++-
 regress/Makefile     |  5 +++--
 regress/multiplex.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 regress/test-exec.sh |  7 ++++++-
 4 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 regress/multiplex.sh

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 768e09bd6..e93749ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - dtucker@cvs.openbsd.org 2004/06/13 13:51:02
      [Makefile test-exec.sh]
      Add scp regression test; with & ok markus@
+   - djm@cvs.openbsd.org 2004/06/13 15:04:08
+     [Makefile test-exec.sh]
+     regress test for client multiplexing; ok markus@
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1234,4 +1237,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.3390 2004/06/16 10:15:59 dtucker Exp $
+$Id: ChangeLog,v 1.3391 2004/06/16 10:22:22 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 8f15f3b4d..64674521b 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2004/06/13 13:51:02 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.30 2004/06/13 15:04:08 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -36,7 +36,8 @@ LTESTS= 	connect \
 		sftp-batch \
 		reconfigure \
 		dynamic-forward \
-		forwarding
+		forwarding \
+		multiplex
 
 USER!=		id -un
 CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
new file mode 100644
index 000000000..70a4e677f
--- /dev/null
+++ b/regress/multiplex.sh
@@ -0,0 +1,55 @@
+#	$OpenBSD: multiplex.sh,v 1.1 2004/06/13 15:04:08 djm Exp $
+#	Placed in the Public Domain.
+
+CTL=$OBJ/ctl-sock
+
+tid="connection multiplexing"
+
+start_sshd
+
+trace "start master, fork to background"
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
+
+trace "ssh transfer over multiplexed connection and check result"
+${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy
+test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
+cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+
+trace "ssh transfer over multiplexed connection and check result"
+${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy
+test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
+cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+
+rm -f $OBJ/ls.copy
+trace "sftp transfer over multiplexed connection and check result"
+echo "get /bin/ls $OBJ/ls.copy" | \
+	${SFTP} -oControlPath=$CTL otherhost
+test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
+cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+
+rm -f $OBJ/ls.copy
+trace "scp transfer over multiplexed connection and check result"
+${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy
+test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
+cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+
+for s in 0 1 4 5 44; do
+	trace "exit status $s over multiplexed connection"
+	verbose "test $tid: status $s"
+	${SSH} -S $CTL otherhost exit $s
+	r=$?
+	if [ $r -ne $s ]; then
+		fail "exit code mismatch for protocol $p: $r != $s"
+	fi
+
+	# same with early close of stdout/err
+	trace "exit status $s with early close over multiplexed connection"
+	${SSH} -S $CTL -n otherhost \
+                exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\'
+	r=$?
+	if [ $r -ne $s ]; then
+		fail "exit code (with sleep) mismatch for protocol $p: $r != $s"
+	fi
+done
+
+sleep 30 # early close test sleeps 5 seconds per test
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index c8827b631..1f7e38d6a 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.17 2004/06/13 13:51:02 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $
 #	Placed in the Public Domain.
 
 PORT=4242
@@ -41,6 +41,7 @@ unset SSH_AUTH_SOCK
 # defaults
 SSH=ssh
 SSHD=sshd
+SCP=scp
 SSHAGENT=ssh-agent
 SSHADD=ssh-add
 SSHKEYGEN=ssh-keygen
@@ -55,6 +56,9 @@ fi
 if [ "x$TEST_SSH_SSHD" != "x" ]; then
 	SSHD="${TEST_SSH_SSHD}"
 fi
+if [ "x$TEST_SSH_SCP" != "x" ]; then
+	SCP="${TEST_SSH_SCP}"
+fi
 if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
 	SSHAGENT="${TEST_SSH_SSHAGENT}"
 fi
@@ -168,6 +172,7 @@ cat << EOF > $OBJ/sshd_config
 	LogLevel		QUIET
 	AcceptEnv		_XXX_TEST_*
 	AcceptEnv		_XXX_TEST
+	Subsystem	sftp	$SFTPSERVER
 	StrictModes		no
 EOF
 
-- 
cgit v1.2.3


From a40395663c675c3946dfa5ffe7bec84a1b38ab2a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:31:18 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/13 15:16:54     
 [regress/test-exec.sh]      remove duplicate setting of $SCP; spotted by
 markus@

---
 ChangeLog            | 5 ++++-
 regress/test-exec.sh | 6 +-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index e93749ed6..ebf3e1d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - djm@cvs.openbsd.org 2004/06/13 15:04:08
      [Makefile test-exec.sh]
      regress test for client multiplexing; ok markus@
+   - djm@cvs.openbsd.org 2004/06/13 15:16:54
+     [regress/test-exec.sh]
+     remove duplicate setting of $SCP; spotted by markus@
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1237,4 +1240,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.3391 2004/06/16 10:22:22 dtucker Exp $
+$Id: ChangeLog,v 1.3392 2004/06/16 10:31:18 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 1f7e38d6a..e0ce88138 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.18 2004/06/13 15:04:08 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.19 2004/06/13 15:16:54 djm Exp $
 #	Placed in the Public Domain.
 
 PORT=4242
@@ -41,7 +41,6 @@ unset SSH_AUTH_SOCK
 # defaults
 SSH=ssh
 SSHD=sshd
-SCP=scp
 SSHAGENT=ssh-agent
 SSHADD=ssh-add
 SSHKEYGEN=ssh-keygen
@@ -56,9 +55,6 @@ fi
 if [ "x$TEST_SSH_SSHD" != "x" ]; then
 	SSHD="${TEST_SSH_SSHD}"
 fi
-if [ "x$TEST_SSH_SCP" != "x" ]; then
-	SCP="${TEST_SSH_SCP}"
-fi
 if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
 	SSHAGENT="${TEST_SSH_SSHAGENT}"
 fi
-- 
cgit v1.2.3


From 9fe95da3ea9f8f0a53f4c2144348e8258900472b Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:33:55 +1000
Subject: Add missing regress/envpass.sh

---
 ChangeLog          |  9 +++++----
 regress/envpass.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 regress/envpass.sh

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index ebf3e1d01..09203eca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,14 +3,15 @@
    code changes.
  - (dtucker) OpenBSD CVS Sync regress/
    - djm@cvs.openbsd.org 2004/04/27 09:47:30
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
      regress test for environment passing, SendEnv & AcceptEnv options;
      ok markus@
    - dtucker@cvs.openbsd.org 2004/06/13 13:51:02
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh
+     regress/scp.sh]
      Add scp regression test; with & ok markus@
    - djm@cvs.openbsd.org 2004/06/13 15:04:08
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
      regress test for client multiplexing; ok markus@
    - djm@cvs.openbsd.org 2004/06/13 15:16:54
      [regress/test-exec.sh]
@@ -1240,4 +1241,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.3392 2004/06/16 10:31:18 dtucker Exp $
+$Id: ChangeLog,v 1.3393 2004/06/16 10:33:55 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
new file mode 100644
index 000000000..67044d421
--- /dev/null
+++ b/regress/envpass.sh
@@ -0,0 +1,44 @@
+#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	Placed in the Public Domain.
+
+tid="environment passing"
+
+# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
+
+trace "pass env, don't accept"
+verbose "test $tid: pass env, don't accept"
+_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_TEST_ENV" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "don't pass env, accept"
+verbose "test $tid: don't pass env, accept"
+${SSH} -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "pass single env, accept single env"
+verbose "test $tid: pass single env, accept single env"
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST" = "xblah" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
+trace "pass multiple env, accept multiple env"
+verbose "test $tid: pass multiple env, accept multiple env"
+_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
+    -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
-- 
cgit v1.2.3


From 0e6868e2c40763ccd2734895fd5a1b5cafff7b3c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:36:16 +1000
Subject:  - (dtucker) [regress/test-exec.sh]    Move Portable-only StrictModes
 to top of list to make syncs easier.

---
 ChangeLog            | 4 +++-
 regress/test-exec.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 09203eca3..0d8c0719a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
    code changes.
+ - (dtucker) [regress/test-exec.sh]
+   Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) OpenBSD CVS Sync regress/
    - djm@cvs.openbsd.org 2004/04/27 09:47:30
      [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
@@ -1241,4 +1243,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.3393 2004/06/16 10:33:55 dtucker Exp $
+$Id: ChangeLog,v 1.3394 2004/06/16 10:36:16 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e0ce88138..296f26eb3 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -160,6 +160,7 @@ trap fatal 3 2
 
 # create server config
 cat << EOF > $OBJ/sshd_config
+	StrictModes		no
 	Port			$PORT
 	ListenAddress		127.0.0.1
 	#ListenAddress		::1
@@ -169,7 +170,6 @@ cat << EOF > $OBJ/sshd_config
 	AcceptEnv		_XXX_TEST_*
 	AcceptEnv		_XXX_TEST
 	Subsystem	sftp	$SFTPSERVER
-	StrictModes		no
 EOF
 
 # server config for proxy connects
-- 
cgit v1.2.3


From 7a06f62b6a211f1257d9284995ac72f3adfa743c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 21:08:32 +1000
Subject:  - (dtucker) [regress/README.regress]    Add $TEST_SHELL to readme.

---
 ChangeLog              | 8 +++++---
 regress/README.regress | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 0d8c0719a..08054bba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
    code changes.
- - (dtucker) [regress/test-exec.sh]
-   Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) OpenBSD CVS Sync regress/
    - djm@cvs.openbsd.org 2004/04/27 09:47:30
      [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
@@ -18,6 +16,10 @@
    - djm@cvs.openbsd.org 2004/06/13 15:16:54
      [regress/test-exec.sh]
      remove duplicate setting of $SCP; spotted by markus@
+ - (dtucker) [regress/test-exec.sh]
+   Move Portable-only StrictModes to top of list to make syncs easier.
+ - (dtucker) [regress/README.regress]
+   Add $TEST_SHELL to readme.
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1243,4 +1245,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.3394 2004/06/16 10:36:16 dtucker Exp $
+$Id: ChangeLog,v 1.3395 2004/06/16 11:08:32 dtucker Exp $
diff --git a/regress/README.regress b/regress/README.regress
index 6ff032b68..81c2fbe5d 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -27,6 +27,7 @@ TEST_SSH_QUIET: set to "yes" to suppress non-fatal output.
 TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD
 	SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER
 OBJ: used by test scripts to access build dir.
+TEST_SHELL: shell used for running the test scripts.
 
 
 Individual tests.
@@ -35,7 +36,8 @@ You can invoke test-exec.sh directly if you set up the path to find the
 binaries under test and the test scripts themselves, for example:
 
 $ cd regress
-$ PATH=`pwd`/..:$PATH:. sh test-exec.sh `pwd` agent-timeout.sh
+$ PATH=`pwd`/..:$PATH:. TEST_SHELL=/bin/sh sh test-exec.sh `pwd` \
+    agent-timeout.sh
 ok agent timeout test
 
 
@@ -94,4 +96,4 @@ Known Issues.
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.4 2004/03/08 20:12:18 tim Exp $
+$Id: README.regress,v 1.5 2004/06/16 11:08:32 dtucker Exp $
-- 
cgit v1.2.3


From 6f0e35b5664b34423f64da2c8dfd876a61888d6d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 23:22:37 +1000
Subject:   - dtucker@cvs.openbsd.org 2004/06/16 13:15:09     [regress/scp.sh] 
    Make scp -r tests use diff -rN not cmp (which won't do dirs.  ok markus@

---
 ChangeLog      | 5 ++++-
 regress/scp.sh | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 08054bba2..9630ed6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
    - djm@cvs.openbsd.org 2004/06/13 15:16:54
      [regress/test-exec.sh]
      remove duplicate setting of $SCP; spotted by markus@
+   - dtucker@cvs.openbsd.org 2004/06/16 13:15:09
+     [regress/scp.sh]
+     Make scp -r tests use diff -rN not cmp (which won't do dirs.  ok markus@
  - (dtucker) [regress/test-exec.sh]
    Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) [regress/README.regress]
@@ -1245,4 +1248,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.3395 2004/06/16 11:08:32 dtucker Exp $
+$Id: ChangeLog,v 1.3396 2004/06/16 13:22:37 dtucker Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index 2d722c70c..cda01868a 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: scp.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $
+#	$OpenBSD: scp.sh,v 1.2 2004/06/16 13:15:09 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="scp"
@@ -45,15 +45,17 @@ cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
 
 verbose "$tid: recursive local dir to remote dir"
 scpclean
+rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
-cmp ${DIR} ${DIR2} || fail "corrupted copy"
+diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
 
 verbose "$tid: recursive remote dir to local dir"
 scpclean
+rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
-cmp ${DIR} ${DIR2} || fail "corrupted copy"
+diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
 
 for i in 0 1 2 3 4; do
 	verbose "$tid: disallow bad server #$i"
-- 
cgit v1.2.3


From 5711dca4a6c631b1a5a4d77688c3567a520cdac0 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 23:23:50 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/16 13:16:40      [multiplex.sh] 
     Silence multiplex sftp and scp tests.  ok markus@

---
 ChangeLog            | 5 ++++-
 regress/multiplex.sh | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 9630ed6da..9f29f6aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
    - dtucker@cvs.openbsd.org 2004/06/16 13:15:09
      [regress/scp.sh]
      Make scp -r tests use diff -rN not cmp (which won't do dirs.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/06/16 13:16:40
+     [multiplex.sh]
+     Silence multiplex sftp and scp tests.  ok markus@
  - (dtucker) [regress/test-exec.sh]
    Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) [regress/README.regress]
@@ -1248,4 +1251,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.3396 2004/06/16 13:22:37 dtucker Exp $
+$Id: ChangeLog,v 1.3397 2004/06/16 13:23:50 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 70a4e677f..9940f15cb 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.1 2004/06/13 15:04:08 djm Exp $
+#	$OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -23,13 +23,13 @@ cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 rm -f $OBJ/ls.copy
 trace "sftp transfer over multiplexed connection and check result"
 echo "get /bin/ls $OBJ/ls.copy" | \
-	${SFTP} -oControlPath=$CTL otherhost
+	${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
 rm -f $OBJ/ls.copy
 trace "scp transfer over multiplexed connection and check result"
-${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy
+${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
-- 
cgit v1.2.3


From 8a2f1b353760922bc7336f7c4030e192e13dc018 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 15:18:32 +1000
Subject:  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for
 some    platforms), so test if diff understands it.  Pointed out by tim@, ok
 djm@

---
 ChangeLog      |  6 +++++-
 regress/scp.sh | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 90447f320..acb0e26dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040617
+ - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
+   platforms), so test if diff understands it.  Pointed out by tim@, ok djm@
+
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
    code changes.
@@ -1251,4 +1255,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.3398 2004/06/16 13:24:19 dtucker Exp $
+$Id: ChangeLog,v 1.3399 2004/06/17 05:18:32 dtucker Exp $
diff --git a/regress/scp.sh b/regress/scp.sh
index cda01868a..703cc0893 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -5,6 +5,13 @@ tid="scp"
 
 #set -x
 
+# Figure out if diff understands "-N"
+if diff -N ${SRC}/scp.sh ${SRC}/scp.sh 2>/dev/null; then
+	DIFFOPT="-rN"
+else
+	DIFFOPT="-r"
+fi
+
 DATA=/bin/ls
 COPY=${OBJ}/copy
 COPY2=${OBJ}/copy2
@@ -48,14 +55,14 @@ scpclean
 rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
-diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
 
 verbose "$tid: recursive remote dir to local dir"
 scpclean
 rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
-diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
 
 for i in 0 1 2 3 4; do
 	verbose "$tid: disallow bad server #$i"
-- 
cgit v1.2.3


From ddea13d74ddaba7951c61d50a798f1c345d677c2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 16:27:43 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/17 05:51:59     
 [regress/multiplex.sh]      Remove datafile between and after tests, kill
 sshd rather than wait;      ok djm@

---
 ChangeLog            |  7 ++++++-
 regress/multiplex.sh | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index acb0e26dd..823a94123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
    platforms), so test if diff understands it.  Pointed out by tim@, ok djm@
+ - (dtucker) OpenBSD CVS Sync regress/
+   - dtucker@cvs.openbsd.org 2004/06/17 05:51:59
+     [regress/multiplex.sh]
+     Remove datafile between and after tests, kill sshd rather than wait;
+     ok djm@
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1255,4 +1260,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.3399 2004/06/17 05:18:32 dtucker Exp $
+$Id: ChangeLog,v 1.3400 2004/06/17 06:27:43 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 9940f15cb..fb4927e62 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -10,11 +10,13 @@ start_sshd
 trace "start master, fork to background"
 ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
 
+rm -f $OBJ/ls.copy
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
+rm -f $OBJ/ls.copy
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
@@ -33,6 +35,8 @@ ${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
+rm -f $OBJ/ls.copy
+
 for s in 0 1 4 5 44; do
 	trace "exit status $s over multiplexed connection"
 	verbose "test $tid: status $s"
@@ -52,4 +56,6 @@ for s in 0 1 4 5 44; do
 	fi
 done
 
-sleep 30 # early close test sleeps 5 seconds per test
+# kill master, remove control socket.  ssh -MS will exit when sleep exits
+$SUDO kill `cat $PIDFILE`
+rm -f $CTL
-- 
cgit v1.2.3


From ffaa6a5f01483d5b43c9165176713d730ec8a2c7 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 16:32:45 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/17 06:00:05     
 [regress/multiplex.sh]      Use DATA and COPY for test data rather than
 hard-coded paths; ok djm@

---
 ChangeLog            |  5 ++++-
 regress/multiplex.sh | 39 +++++++++++++++++++++------------------
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 823a94123..b6617d7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
      [regress/multiplex.sh]
      Remove datafile between and after tests, kill sshd rather than wait;
      ok djm@
+   - dtucker@cvs.openbsd.org 2004/06/17 06:00:05
+     [regress/multiplex.sh]
+     Use DATA and COPY for test data rather than hard-coded paths; ok djm@
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1260,4 +1263,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.3400 2004/06/17 06:27:43 dtucker Exp $
+$Id: ChangeLog,v 1.3401 2004/06/17 06:32:45 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index fb4927e62..9fea117bd 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,41 +1,44 @@
-#	$OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.4 2004/06/17 06:00:05 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
 
 tid="connection multiplexing"
 
+DATA=/bin/ls
+COPY=$OBJ/ls.copy
+
 start_sshd
 
 trace "start master, fork to background"
 ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
 
-rm -f $OBJ/ls.copy
+rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
-${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy
-test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
-cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}
+test -f ${COPY}				|| fail "failed copy ${DATA}" 
+cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
 
-rm -f $OBJ/ls.copy
+rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
-${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy
-test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
-cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+${SSH} -S $CTL otherhost cat ${DATA} > ${COPY}
+test -f ${COPY}				|| fail "failed copy ${DATA}" 
+cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
 
-rm -f $OBJ/ls.copy
+rm -f ${COPY}
 trace "sftp transfer over multiplexed connection and check result"
-echo "get /bin/ls $OBJ/ls.copy" | \
+echo "get ${DATA} ${COPY}" | \
 	${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
-test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
-cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+test -f ${COPY}				|| fail "failed copy ${DATA}" 
+cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
 
-rm -f $OBJ/ls.copy
+rm -f ${COPY}
 trace "scp transfer over multiplexed connection and check result"
-${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
-test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
-cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
+${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
+test -f ${COPY}				|| fail "failed copy ${DATA}" 
+cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
 
-rm -f $OBJ/ls.copy
+rm -f ${COPY}
 
 for s in 0 1 4 5 44; do
 	trace "exit status $s over multiplexed connection"
-- 
cgit v1.2.3


From 3e86fc4e992cec58461d6170816d03b36ad8f783 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 16:34:02 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/17 06:19:06     
 [regress/multiplex.sh]      Add small description of failing test to failure
 message; ok djm@

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

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index b6617d7ee..39f4e45d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - dtucker@cvs.openbsd.org 2004/06/17 06:00:05
      [regress/multiplex.sh]
      Use DATA and COPY for test data rather than hard-coded paths; ok djm@
+   - dtucker@cvs.openbsd.org 2004/06/17 06:19:06
+     [regress/multiplex.sh]
+     Add small description of failing test to failure message; ok djm@
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1263,4 +1266,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.3401 2004/06/17 06:32:45 dtucker Exp $
+$Id: ChangeLog,v 1.3402 2004/06/17 06:34:02 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 9fea117bd..b70a99c01 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.4 2004/06/17 06:00:05 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.5 2004/06/17 06:19:06 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -16,27 +16,27 @@ ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
 rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}
-test -f ${COPY}				|| fail "failed copy ${DATA}" 
-cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
+test -f ${COPY}			|| fail "ssh -Sctl: failed copy ${DATA}" 
+cmp ${DATA} ${COPY}		|| fail "ssh -Sctl: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S $CTL otherhost cat ${DATA} > ${COPY}
-test -f ${COPY}				|| fail "failed copy ${DATA}" 
-cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
+test -f ${COPY}			|| fail "ssh -S ctl: failed copy ${DATA}" 
+cmp ${DATA} ${COPY}		|| fail "ssh -S ctl: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 trace "sftp transfer over multiplexed connection and check result"
 echo "get ${DATA} ${COPY}" | \
 	${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
-test -f ${COPY}				|| fail "failed copy ${DATA}" 
-cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
+test -f ${COPY}			|| fail "sftp: failed copy ${DATA}" 
+cmp ${DATA} ${COPY}		|| fail "sftp: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 trace "scp transfer over multiplexed connection and check result"
 ${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
-test -f ${COPY}				|| fail "failed copy ${DATA}" 
-cmp ${DATA} ${COPY}			|| fail "corrupted copy of ${DATA}"
+test -f ${COPY}			|| fail "scp: failed copy ${DATA}" 
+cmp ${DATA} ${COPY}		|| fail "scp: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 
-- 
cgit v1.2.3


From 10e7f1929b54dcdd91fea2fe03e9450abdd8b31c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 16:36:27 +1000
Subject:  - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms
 that need    it.

---
 ChangeLog            | 4 +++-
 regress/multiplex.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 39f4e45d2..04086429e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
    - dtucker@cvs.openbsd.org 2004/06/17 06:19:06
      [regress/multiplex.sh]
      Add small description of failing test to failure message; ok djm@
+ - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need
+   it.
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1266,4 +1268,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.3402 2004/06/17 06:34:02 dtucker Exp $
+$Id: ChangeLog,v 1.3403 2004/06/17 06:36:27 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b70a99c01..654aae5e6 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -5,7 +5,7 @@ CTL=$OBJ/ctl-sock
 
 tid="connection multiplexing"
 
-DATA=/bin/ls
+DATA=/bin/ls${EXEEXT}
 COPY=$OBJ/ls.copy
 
 start_sshd
-- 
cgit v1.2.3


From a9972e19e941f9f711103b50dd57f6bc0c1aad53 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 17 Jun 2004 17:01:21 +1000
Subject:  - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec
 (60 is not    enough for slow systems, especially if they don't have a kernel
 RNG).

---
 ChangeLog            | 4 +++-
 regress/multiplex.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 04086429e..95b583e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
      Add small description of failing test to failure message; ok djm@
  - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need
    it.
+ - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not
+   enough for slow systems, especially if they don't have a kernel RNG).
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1268,4 +1270,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.3403 2004/06/17 06:36:27 dtucker Exp $
+$Id: ChangeLog,v 1.3404 2004/06/17 07:01:21 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 654aae5e6..8605d5e0b 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -11,7 +11,7 @@ COPY=$OBJ/ls.copy
 start_sshd
 
 trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 120
 
 rm -f ${COPY}
 trace "ssh transfer over multiplexed connection and check result"
-- 
cgit v1.2.3


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:    - 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(-)

(limited to 'regress')

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}
-- 
cgit v1.2.3


From 13fbe57722748399a165791b6e37b6dccbe73c12 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 18 Jun 2004 14:14:43 +1000
Subject:  - (dtucker) [regress/README.regress] Add detail on how to run a
 single    test from the top-level Makefile.

---
 ChangeLog              |  4 +++-
 regress/README.regress | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 53882b05d..96701bfef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
    - djm@cvs.openbsd.org 2004/06/17 14:53:27
      [regress/multiplex.sh]
      shared connection env passing regress test
+ - (dtucker) [regress/README.regress] Add detail on how to run a single
+   test from the top-level Makefile.
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1283,4 +1285,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.3407 2004/06/17 15:23:03 djm Exp $
+$Id: ChangeLog,v 1.3408 2004/06/18 04:14:43 dtucker Exp $
diff --git a/regress/README.regress b/regress/README.regress
index 81c2fbe5d..cf469479b 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -32,8 +32,12 @@ TEST_SHELL: shell used for running the test scripts.
 
 Individual tests.
 
-You can invoke test-exec.sh directly if you set up the path to find the
-binaries under test and the test scripts themselves, for example:
+You can run an individual test from the top-level Makefile, eg:
+$ make tests LTESTS=agent-timeout
+
+If you need to manipulate the environment more you can invoke test-exec.sh
+directly if you set up the path to find the binaries under test and the
+test scripts themselves, for example:
 
 $ cd regress
 $ PATH=`pwd`/..:$PATH:. TEST_SHELL=/bin/sh sh test-exec.sh `pwd` \
@@ -96,4 +100,4 @@ Known Issues.
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.5 2004/06/16 11:08:32 dtucker Exp $
+$Id: README.regress,v 1.6 2004/06/18 04:14:43 dtucker Exp $
-- 
cgit v1.2.3


From 6288dc14fcce8f88216506ac3226849c3e43cfa7 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 18 Jun 2004 16:25:35 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/18 06:15:51      [multiplex.sh] 
     Use -S for scp/sftp to force the use of the ssh being tested.      ok
 djm@,markus@

---
 ChangeLog            | 6 +++++-
 regress/multiplex.sh | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 56c49b6ce..cd2fc1951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
    - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
      [sftp.c]
      Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@
+   - dtucker@cvs.openbsd.org 2004/06/18 06:15:51
+     [multiplex.sh]
+     Use -S for scp/sftp to force the use of the ssh being tested.
+     ok djm@,markus@
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
@@ -1292,4 +1296,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.3410 2004/06/18 06:23:43 dtucker Exp $
+$Id: ChangeLog,v 1.3411 2004/06/18 06:25:35 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index c19c0fe17..c167b9632 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.6 2004/06/17 14:53:27 djm Exp $
+#	$OpenBSD: multiplex.sh,v 1.7 2004/06/18 06:15:51 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -37,13 +37,13 @@ cmp ${DATA} ${COPY}		|| fail "ssh -S ctl: corrupted copy of ${DATA}"
 rm -f ${COPY}
 trace "sftp transfer over multiplexed connection and check result"
 echo "get ${DATA} ${COPY}" | \
-	${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
+	${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1
 test -f ${COPY}			|| fail "sftp: failed copy ${DATA}" 
 cmp ${DATA} ${COPY}		|| fail "sftp: corrupted copy of ${DATA}"
 
 rm -f ${COPY}
 trace "scp transfer over multiplexed connection and check result"
-${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
+${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
 test -f ${COPY}			|| fail "scp: failed copy ${DATA}" 
 cmp ${DATA} ${COPY}		|| fail "scp: corrupted copy of ${DATA}"
 
-- 
cgit v1.2.3


From 430c6a1552e25a1163e6fa1bade9a276791679a6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 22 Jun 2004 13:38:56 +1000
Subject:    - markus@cvs.openbsd.org 2004/06/22 03:12:13     
 [regress/envpass.sh regress/multiplex.sh]      more portable env passing
 tests

---
 ChangeLog            |  5 ++++-
 regress/envpass.sh   | 19 +++++++++++++------
 regress/multiplex.sh |  9 +++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 00864980a..f5a1b14c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
      [sftp.c]
      don't show .files by default in ls, add -a option to turn them back on;
      ok markus
+   - markus@cvs.openbsd.org 2004/06/22 03:12:13
+     [regress/envpass.sh regress/multiplex.sh]
+     more portable env passing tests
  - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
  - (dtucker) [defines.h] Define __dead if not already defined.
 
@@ -1362,4 +1365,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.3430 2004/06/22 03:37:11 mouring Exp $
+$Id: ChangeLog,v 1.3431 2004/06/22 03:38:56 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
index 67044d421..a5bae06dd 100644
--- a/regress/envpass.sh
+++ b/regress/envpass.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	$OpenBSD: envpass.sh,v 1.2 2004/06/22 03:12:13 markus Exp $
 #	Placed in the Public Domain.
 
 tid="environment passing"
@@ -8,7 +8,9 @@ tid="environment passing"
 trace "pass env, don't accept"
 verbose "test $tid: pass env, don't accept"
 _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
-	'[ -z "$_TEST_ENV" ]'
+	sh << 'EOF'
+	test -z $_TEST_ENV
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment found"
@@ -17,7 +19,9 @@ fi
 trace "don't pass env, accept"
 verbose "test $tid: don't pass env, accept"
 ${SSH} -F $OBJ/ssh_proxy otherhost \
-	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+	sh << 'EOF'
+	test -z $_XXX_TEST_A && test -z $_XXX_TEST_B
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment found"
@@ -26,7 +30,9 @@ fi
 trace "pass single env, accept single env"
 verbose "test $tid: pass single env, accept single env"
 _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
-	'[ "x$_XXX_TEST" = "xblah" ]'
+	sh << 'EOF'
+	test X"$_XXX_TEST" = X"blah"
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment not found"
@@ -36,9 +42,10 @@ trace "pass multiple env, accept multiple env"
 verbose "test $tid: pass multiple env, accept multiple env"
 _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
     -F $OBJ/ssh_proxy otherhost \
-	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+	sh << 'EOF'
+	test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2"
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment not found"
 fi
-
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index c167b9632..dbf2025be 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.7 2004/06/18 06:15:51 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -11,12 +11,13 @@ COPY=$OBJ/ls.copy
 start_sshd
 
 trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST"  -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" ]'
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF'
+	test X"$_XXX_TEST" = X"blah"
+EOF
 if [ $? -ne 0 ]; then
 	fail "environment not found"
 fi
-- 
cgit v1.2.3


From 6eabe6430418fa9051500bed9ca4b1ffb377e3ec Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 23 Jun 2004 09:23:58 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/22 22:42:02     
 [regress/envpass.sh]      Add quoting for test -z; ok markus@

---
 ChangeLog          | 6 +++++-
 regress/envpass.sh | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index e8fe5b4ff..ae05fc84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
    connections with empty passwords.  Patch from davidwu at nbttech.com,
    ok djm@
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2004/06/22 22:42:02
+     [regress/envpass.sh]
+     Add quoting for test -z; ok markus@
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1374,4 +1378,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.3433 2004/06/22 23:17:54 dtucker Exp $
+$Id: ChangeLog,v 1.3434 2004/06/22 23:23:58 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
index a5bae06dd..5a7e178d8 100644
--- a/regress/envpass.sh
+++ b/regress/envpass.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: envpass.sh,v 1.2 2004/06/22 03:12:13 markus Exp $
+#	$OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="environment passing"
@@ -9,7 +9,7 @@ trace "pass env, don't accept"
 verbose "test $tid: pass env, don't accept"
 _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
 	sh << 'EOF'
-	test -z $_TEST_ENV
+	test -z "$_TEST_ENV"
 EOF
 r=$?
 if [ $r -ne 0 ]; then
@@ -20,7 +20,7 @@ trace "don't pass env, accept"
 verbose "test $tid: don't pass env, accept"
 ${SSH} -F $OBJ/ssh_proxy otherhost \
 	sh << 'EOF'
-	test -z $_XXX_TEST_A && test -z $_XXX_TEST_B
+	test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B"
 EOF
 r=$?
 if [ $r -ne 0 ]; then
-- 
cgit v1.2.3


From 6223eea5962535f2efe9789a9bc19ecca1539713 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
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@

---
 ChangeLog            |  6 +++++-
 regress/test-exec.sh | 12 +++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'regress')

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"
-- 
cgit v1.2.3


From 3b9c0adaab5736a1b9f5d69a3bf471ff46b8b88f Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 23 Jun 2004 09:28:20 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/22 22:55:56     
 [regress/dynamic-forward.sh regress/test-exec.sh]      Allow setting of port
 for regress from TEST_SSH_PORT variable; ok markus@

---
 ChangeLog                  | 5 ++++-
 regress/dynamic-forward.sh | 4 ++--
 regress/test-exec.sh       | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 7250dd68d..b91be9ded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      [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@
+   - dtucker@cvs.openbsd.org 2004/06/22 22:55:56
+     [regress/dynamic-forward.sh regress/test-exec.sh]
+     Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1382,4 +1385,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.3435 2004/06/22 23:25:02 dtucker Exp $
+$Id: ChangeLog,v 1.3436 2004/06/22 23:28:20 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 3a6e5c1ef..392fc1978 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -3,8 +3,8 @@
 
 tid="dynamic forwarding"
 
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
+
 DATA=/bin/ls${EXEEXT}
 
 if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a184c16d1..b0ac64e9e 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,9 +1,14 @@
 #	$OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
 #	Placed in the Public Domain.
 
-PORT=4242
 #SUDO=sudo
 
+if [ ! -z "$TEST_SSH_PORT" ]; then
+	PORT="$TEST_SSH_PORT"
+else
+	PORT=4242
+fi
+
 if [ -x /usr/ucb/whoami ]; then
 	USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then
-- 
cgit v1.2.3


From af4ab6cbf57f8d43e62c7d1e74f922e54b1844b4 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Tue, 22 Jun 2004 20:53:02 -0700
Subject:  - (tim) [regress/try-ciphers.sh] "if ! some_command" is not
 portable.

---
 ChangeLog              | 3 ++-
 regress/try-ciphers.sh | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index d9f4c8d99..cf5aeac73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
    -Wshadow change.
  - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
    Move loginrestrictions test to port-aix.c, replace with a generic hook.
+ - (tim) [regress/try-ciphers.sh] "if ! some_command" is not portable.
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1390,4 +1391,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.3439 2004/06/23 03:45:24 dtucker Exp $
+$Id: ChangeLog,v 1.3440 2004/06/23 03:53:02 tim Exp $
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 15827e250..c6e1b9152 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -29,8 +29,10 @@ for c in $ciphers; do
 	fi
 done
 
-if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
+if ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
 then
+	:
+else
 
 echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
 c=acss@openssh.org
-- 
cgit v1.2.3


From 977a9d21c885d9da6f6ac3c8d16f70765b0934ce Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 25 Jun 2004 13:45:18 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/24 19:32:00      [regress/Makefile
 regress/test-exec.sh, added regress/reexec.sh]      regress test for re-exec
 corner cases

---
 ChangeLog            |  5 ++-
 regress/Makefile     |  5 +--
 regress/reexec.sh    | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 regress/test-exec.sh | 26 +++++++++++++++-
 4 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 regress/reexec.sh

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 2e5b94c41..ce4c6b3fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
      only perform tcp wrappers checks when the incoming connection is on a
      socket.  silences useless warnings from regress tests that use
      proxycommand="sshd -i".  prompted by david@ ok markus@
+   - djm@cvs.openbsd.org 2004/06/24 19:32:00
+     [regress/Makefile regress/test-exec.sh, added regress/reexec.sh]
+     regress test for re-exec corner cases
 
 20040623
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1410,4 +1413,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.3445 2004/06/25 03:34:31 dtucker Exp $
+$Id: ChangeLog,v 1.3446 2004/06/25 03:45:18 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 64674521b..9e98e5880 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2004/06/13 15:04:08 djm Exp $
+#	$OpenBSD: Makefile,v 1.31 2004/06/24 19:32:00 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -37,7 +37,8 @@ LTESTS= 	connect \
 		reconfigure \
 		dynamic-forward \
 		forwarding \
-		multiplex
+		multiplex \
+		reexec
 
 USER!=		id -un
 CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
diff --git a/regress/reexec.sh b/regress/reexec.sh
new file mode 100644
index 000000000..39fffefbc
--- /dev/null
+++ b/regress/reexec.sh
@@ -0,0 +1,87 @@
+#	$OpenBSD: reexec.sh,v 1.3 2004/06/25 01:32:44 djm Exp $
+#	Placed in the Public Domain.
+
+tid="reexec tests"
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+SSHD_ORIG=$SSHD
+SSHD_COPY=$OBJ/sshd.copy
+
+# Start a sshd and then delete it
+start_sshd_copy_zap ()
+{
+	cp $SSHD_ORIG $SSHD_COPY
+	SSHD=$SSHD_COPY
+	start_sshd
+	rm -f $SSHD_COPY
+	SSHD=$SSHD_ORIG
+}
+
+verbose "test config passing"
+cp $OBJ/sshd_config $OBJ/sshd_config.orig
+
+start_sshd
+
+echo "InvalidXXX=no" >> $OBJ/sshd_config
+
+rm -f ${COPY}
+for p in 1 2; do
+	verbose "$tid: proto $p"
+	${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \
+	    cat ${DATA} > ${COPY}
+	if [ $? -ne 0 ]; then
+		fail "ssh cat $DATA failed"
+	fi
+	cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+	rm -f ${COPY}
+done
+
+$SUDO kill `cat $PIDFILE`
+rm -f $PIDFILE
+
+cp $OBJ/sshd_config.orig $OBJ/sshd_config
+
+verbose "test reexec fallback"
+
+start_sshd_copy_zap
+
+rm -f ${COPY}
+for p in 1 2; do
+	verbose "$tid: proto $p"
+	${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \
+	    cat ${DATA} > ${COPY}
+	if [ $? -ne 0 ]; then
+		fail "ssh cat $DATA failed"
+	fi
+	cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+	rm -f ${COPY}
+done
+
+$SUDO kill `cat $PIDFILE`
+rm -f $PIDFILE
+
+verbose "test reexec fallback without privsep"
+
+cp $OBJ/sshd_config.orig $OBJ/sshd_config
+echo "UsePrivilegeSeparation=no" >> $OBJ/sshd_config
+
+start_sshd_copy_zap
+
+rm -f ${COPY}
+for p in 1 2; do
+	verbose "$tid: proto $p"
+	${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \
+	    cat ${DATA} > ${COPY}
+	if [ $? -ne 0 ]; then
+		fail "ssh cat $DATA failed"
+	fi
+	cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+	rm -f ${COPY}
+done
+
+$SUDO kill `cat $PIDFILE`
+rm -f $PIDFILE
+
+cp $OBJ/sshd_config.orig $OBJ/sshd_config
+
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b0ac64e9e..e626dd78a 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.22 2004/06/24 19:32:00 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -82,6 +82,9 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
 	SCP="${TEST_SSH_SCP}"
 fi
 
+# Path to sshd must be absolute for rexec
+SSHD=`which sshd`
+
 # these should be used in tests
 export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
 #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
@@ -265,6 +268,27 @@ start_sshd ()
 	test -f $PIDFILE || fatal "no sshd running on port $PORT"
 }
 
+# Start a sshd and then delete it
+start_sshd_copy_zap ()
+{
+	cp ${SSHD} $OBJ/sshd.copy
+	SSHD_CPY=`which $OBJ/sshd.copy`
+
+	# start sshd
+	$SUDO $SSHD_CPY -f $OBJ/sshd_config -t	|| fatal "sshd_config broken"
+	$SUDO $SSHD_CPY -f $OBJ/sshd_config
+
+	trace "wait for sshd"
+	i=0;
+	while [ ! -f $PIDFILE -a $i -lt 5 ]; do
+		i=`expr $i + 1`
+		sleep $i
+	done
+
+	test -f $PIDFILE || fatal "no sshd running on port $PORT"
+	rm -f $OBJ/sshd.copy
+}
+
 # source test body
 . $SCRIPT
 
-- 
cgit v1.2.3


From ef3b47a73adf98a510200daea9ebfceebed5bed6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 25 Jun 2004 13:46:08 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/25 01:25:12     
 [regress/test-exec.sh]      clean reexec-specific junk out of text-exec.sh
 and simplify; idea markus@

---
 ChangeLog            |  5 ++++-
 regress/test-exec.sh | 23 +----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index ce4c6b3fa..e6903097c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
    - djm@cvs.openbsd.org 2004/06/24 19:32:00
      [regress/Makefile regress/test-exec.sh, added regress/reexec.sh]
      regress test for re-exec corner cases
+   - djm@cvs.openbsd.org 2004/06/25 01:25:12
+     [regress/test-exec.sh]
+     clean reexec-specific junk out of text-exec.sh and simplify; idea markus@
 
 20040623
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1413,4 +1416,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.3446 2004/06/25 03:45:18 dtucker Exp $
+$Id: ChangeLog,v 1.3447 2004/06/25 03:46:08 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e626dd78a..70250acd7 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.22 2004/06/24 19:32:00 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.23 2004/06/25 01:25:12 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -268,27 +268,6 @@ start_sshd ()
 	test -f $PIDFILE || fatal "no sshd running on port $PORT"
 }
 
-# Start a sshd and then delete it
-start_sshd_copy_zap ()
-{
-	cp ${SSHD} $OBJ/sshd.copy
-	SSHD_CPY=`which $OBJ/sshd.copy`
-
-	# start sshd
-	$SUDO $SSHD_CPY -f $OBJ/sshd_config -t	|| fatal "sshd_config broken"
-	$SUDO $SSHD_CPY -f $OBJ/sshd_config
-
-	trace "wait for sshd"
-	i=0;
-	while [ ! -f $PIDFILE -a $i -lt 5 ]; do
-		i=`expr $i + 1`
-		sleep $i
-	done
-
-	test -f $PIDFILE || fatal "no sshd running on port $PORT"
-	rm -f $OBJ/sshd.copy
-}
-
 # source test body
 . $SCRIPT
 
-- 
cgit v1.2.3


From f9eb2b013510ef35372560e673d0bf80b1b4dd2c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 28 Jun 2004 15:52:50 +1000
Subject:  - (dtucker) [regress/README.regress] Document new variables.

---
 ChangeLog              | 3 ++-
 regress/README.regress | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 23cb9ef24..e17a57595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20040627
  - (tim) update README files.
  - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros.
+ - (dtucker) [regress/README.regress] Document new variables.
 
 20040626
  - (djm) OpenBSD CVS Sync
@@ -1437,4 +1438,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.3454 2004/06/28 05:45:08 dtucker Exp $
+$Id: ChangeLog,v 1.3455 2004/06/28 05:52:50 dtucker Exp $
diff --git a/regress/README.regress b/regress/README.regress
index cf469479b..e3e21f703 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -28,6 +28,11 @@ TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD
 	SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER
 OBJ: used by test scripts to access build dir.
 TEST_SHELL: shell used for running the test scripts.
+TEST_SSH_PORT: TCP port to be used for the listening tests.
+TEST_SSH_SSH_CONFOTPS: Configuration directives to be added to ssh_config
+	before running each test.
+TEST_SSH_SSHD_CONFOTPS: Configuration directives to be added to sshd_config
+	before running each test.
 
 
 Individual tests.
@@ -100,4 +105,4 @@ Known Issues.
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.6 2004/06/18 04:14:43 dtucker Exp $
+$Id: README.regress,v 1.7 2004/06/28 05:52:51 dtucker Exp $
-- 
cgit v1.2.3


From b5a21440a88fb8366d5032e8ce895cf7a52cb1ea Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 21 Jul 2004 20:44:05 +1000
Subject:  - (djm) [regress/README.regress] Remove caveat regarding TCP
 wrappers, now    that sshd is fixed to behave better; suggested by tim

---
 ChangeLog              |  6 ++++--
 regress/README.regress | 10 +---------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index 53e62a02e..191ff9838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
-20040719
+20040720
  - (djm) [log.c] bz #111: Escape more control characters when sending data 
    to syslog; from peak AT argo.troja.mff.cuni.cz
  - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from 
    peak AT argo.troja.mff.cuni.cz
+ - (djm) [regress/README.regress] Remove caveat regarding TCP wrappers, now
+   that sshd is fixed to behave better; suggested by tim
 
 20040719
  - (djm) [openbsd-compat/bsd-arc4random.c] Discard early keystream, like OpenBSD
@@ -1541,4 +1543,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.3482 2004/07/21 01:01:41 djm Exp $
+$Id: ChangeLog,v 1.3483 2004/07/21 10:44:05 djm Exp $
diff --git a/regress/README.regress b/regress/README.regress
index e3e21f703..1c30be330 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -93,16 +93,8 @@ Failed tests can be difficult to diagnose. Suggestions:
 
 Known Issues.
 
-- If you build with tcpwrappers and try to run the regression tests,
-  your hosts.allow must permit connections from localhost and from
-  "unknown".  This is because some tests are performed via the loopback
-  interface, while others are done with "sshd -i" as a ProxyCommand.  In
-  the latter case, when sshd calls getpeername() on the socket it will
-  fail (because it's not a tcp socket) and will be identified as
-  "unknown", which is then checked against tcpwrappers.
-
 - If your build requires ssh-rand-helper regress tests will fail
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.7 2004/06/28 05:52:51 dtucker Exp $
+$Id: README.regress,v 1.8 2004/07/21 10:44:06 djm Exp $
-- 
cgit v1.2.3


From bad5f2d329a7d8784e12134f3f2c531bbc635900 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 17 Aug 2004 22:31:32 +1000
Subject:  - (dtucker) [regress/README.regress] Note compatibility issues with
 GNU head.

---
 ChangeLog              | 5 ++++-
 regress/README.regress | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'regress')

diff --git a/ChangeLog b/ChangeLog
index ca9f92983..b3ab3d19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20040817
+ - (dtucker) [regress/README.regress] Note compatibility issues with GNU head.
+
 20040816
  - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root
    to convince Solaris PAM to honour password complexity rules.  ok djm@
@@ -1645,4 +1648,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.3513 2004/08/16 13:12:05 dtucker Exp $
+$Id: ChangeLog,v 1.3514 2004/08/17 12:31:32 dtucker Exp $
diff --git a/regress/README.regress b/regress/README.regress
index 1c30be330..0c07c9cf1 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -97,4 +97,8 @@ Known Issues.
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.8 2004/07/21 10:44:06 djm Exp $
+- Recent GNU coreutils deprecate "head -[n]": this will cause the yes-head
+  test to fail.  The old behaviour can be restored by setting (and
+  exporting) _POSIX2_VERSION=199209 before running the tests.
+
+$Id: README.regress,v 1.9 2004/08/17 12:31:33 dtucker Exp $
-- 
cgit v1.2.3