- djm@cvs.openbsd.org 2014/07/06 07:42:03

     [multiplex.sh test-exec.sh]
     add a hook to the cleanup() function to kill $SSH_PID if it is set

     use it to kill the mux master started in multiplex.sh (it was being left
     around on fatal failures)

1 files changed, 9 insertions, 2 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index aac8aa5c2..a1bab832f 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.47 2013/11/09 05:41:34 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.48 2014/07/06 07:42:03 djm Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -240,13 +240,20 @@ md5 () {
 # helper
 cleanup ()
 {
+        if [ "x$SSH_PID" != "x" ]; then
+                if [ $SSH_PID -lt 2 ]; then
+                        echo bad pid for ssh: $SSH_PID
+                else
+                        kill $SSH_PID
+                fi
+        fi
         if [ -f $PIDFILE ]; then
                 pid=`$SUDO cat $PIDFILE`
                 if [ "X$pid" = "X" ]; then
                         echo no sshd running
                 else
                         if [ $pid -lt 2 ]; then
-                                echo bad pid for ssh: $pid
+                                echo bad pid for sshd: $pid
                         else
                                 $SUDO kill $pid
                                 trace "wait for sshd to exit"