upstream commit
Move the "stop sshd" code into its own helper function.
Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@
Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 6ac648f..72957d4 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: reexec.sh,v 1.9 2016/12/15 23:50:37 dtucker Exp $
+# $OpenBSD: reexec.sh,v 1.10 2016/12/16 01:06:27 dtucker Exp $
# Placed in the Public Domain.
tid="reexec tests"
@@ -39,8 +39,7 @@
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
cp $OBJ/sshd_config.orig $OBJ/sshd_config
@@ -54,8 +53,7 @@
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
verbose "test reexec fallback without privsep"
@@ -67,7 +65,6 @@
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
fi