Import of OpenSSH 4.1p1

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

diff --git a/openssh/regress/multiplex.sh b/openssh/regress/multiplex.sh
index e8cc1ac53190c5b00b2ad5938b417e43b61211b9..a172e579052d03fa5bd4e658d10019f920a13e5f 100644 (file)
--- a/openssh/regress/multiplex.sh
+++ b/openssh/regress/multiplex.sh
@@ -1,7 +1,7 @@
 #      $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $
 #      Placed in the Public Domain.
 
-CTL=$OBJ/ctl-sock
+CTL=/tmp/openssh.regress.ctl-sock.$$
 
 tid="connection multiplexing"
 
@@ -89,6 +89,4 @@ ${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
+kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"