Import of OpenSSH 4.0p1

[gssapi-openssh.git] / openssh / regress / multiplex.sh

diff --git a/openssh/regress/multiplex.sh b/openssh/regress/multiplex.sh
index dbf2025be9af36657869b600d176cef9ff865882..e8cc1ac53190c5b00b2ad5938b417e43b61211b9 100644 (file)
--- a/openssh/regress/multiplex.sh
+++ b/openssh/regress/multiplex.sh
@@ -1,17 +1,28 @@
-#      $OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $
+#      $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $
 #      Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
 
 tid="connection multiplexing"
 
+if grep "#define.*DISABLE_FD_PASSING" ${BUILDDIR}/config.h >/dev/null 2>&1
+then
+       echo "skipped (not supported on this platform)"
+       exit 0
+fi
+
 DATA=/bin/ls${EXEEXT}
 COPY=$OBJ/ls.copy
+LOG=$TEST_SSH_LOGFILE
 
 start_sshd
 
 trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120
+${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost &
+MASTER_PID=$!
+
+# Wait for master to start and authenticate
+sleep 5
 
 verbose "test $tid: envpass"
 trace "env passing over multiplexed connection"
@@ -38,13 +49,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} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1
+       ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >$LOG 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} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
+${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1
 test -f ${COPY}                        || fail "scp: failed copy ${DATA}" 
 cmp ${DATA} ${COPY}            || fail "scp: corrupted copy of ${DATA}"
 
@@ -69,6 +80,15 @@ for s in 0 1 4 5 44; do
        fi
 done
 
-# kill master, remove control socket.  ssh -MS will exit when sleep exits
-$SUDO kill `cat $PIDFILE`
-rm -f $CTL
+trace "test check command"
+${SSH} -S $CTL -Ocheck otherhost || fail "check command failed" 
+
+trace "test exit command"
+${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed" 
+
+# Wait for master to exit
+sleep 2
+
+ps -p $MASTER_PID >/dev/null && fail "exit command failed" 
+
+cleanup