summaryrefslogtreecommitdiff
path: root/regress/reexec.sh
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-12-16 01:06:27 +0000
committerDamien Miller <djm@mindrot.org>2016-12-16 13:16:34 +1100
commit2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e (patch)
treee23577a9aadfbaed15dccfcd289f74ac542d3397 /regress/reexec.sh
parente15e7152331e3976b35475fd4e9c72897ad0f074 (diff)
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
Diffstat (limited to 'regress/reexec.sh')
-rw-r--r--regress/reexec.sh11
1 files changed, 4 insertions, 7 deletions
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 6ac648fd..72957d4c 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 @@ echo "InvalidXXX=no" >> $OBJ/sshd_config
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
cp $OBJ/sshd_config.orig $OBJ/sshd_config
@@ -54,8 +53,7 @@ rm -f $SSHD_COPY
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
verbose "test reexec fallback without privsep"
@@ -67,7 +65,6 @@ rm -f $SSHD_COPY
copy_tests
-$SUDO kill `$SUDO cat $PIDFILE`
-rm -f $PIDFILE
+stop_sshd
fi