2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ed715925..51cba6eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
      keyboard-interactive.
      
      ok markus@
+   - dtucker@cvs.openbsd.org 2012/10/05 02:05:30
+     [regress/multiplex.sh]
+     Use 'kill -0' to test for the presence of a pid since it's more portable
 
 20121107
  - (djm) OpenBSD CVS Sync
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index f93ac9a41..1e6cc7606 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: multiplex.sh,v 1.16 2012/09/10 01:51:19 dtucker Exp $
+#       $OpenBSD: multiplex.sh,v 1.17 2012/10/05 02:05:30 dtucker Exp $
 #       Placed in the Public Domain.
 
 CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -96,7 +96,7 @@ ${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost >>$TEST_SSH_LOGFILE 2>&1 \
 
 # Wait for master to exit
 wait $MASTER_PID
-kill -0 $MASTER_PID >/dev/null && fail "exit command failed"
+kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"
 
 # Restart master and test -O stop command with master using -N
 verbose "test $tid: cmd stop"
@@ -117,4 +117,4 @@ wait $SLEEP_PID
 [ $! != 0 ] || fail "waiting for concurrent command"
 wait $MASTER_PID
 [ $! != 0 ] || fail "waiting for master stop"
-kill -0 $MASTER_PID >/dev/null && fail "stop command failed"
+kill -0 $MASTER_PID >/dev/null 2>&1 && fail "stop command failed"