summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-01-19 07:53:45 +0000
committerDamien Miller <djm@mindrot.org>2023-02-02 23:15:47 +1100
commit405fba71962dec8409c0c962408e09049e5624b5 (patch)
tree721094257ed14e0f80ac4480b3779ee2eed67cf7
parentb2a2a8f69fd7737ea17dc044353c514f2f962f35 (diff)
upstream: Check if we can copy sshd or need to use sudo to do so
during reexec test. Skip test if neither can work. Patch from anton@, tweaks from me. OpenBSD-Regress-ID: 731b96ae74d02d5744e1f1a8e51d09877ffd9b6d
-rw-r--r--regress/reexec.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 8966ba52..3f88d41f 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: reexec.sh,v 1.12 2017/08/07 03:52:55 dtucker Exp $
+# $OpenBSD: reexec.sh,v 1.13 2023/01/19 07:53:45 dtucker Exp $
# Placed in the Public Domain.
tid="reexec tests"
@@ -49,7 +49,7 @@ if [ "$os" != "cygwin" ]; then
verbose "test reexec fallback"
start_sshd_copy
-rm -f $SSHD_COPY
+$SUDO rm -f $SSHD_COPY
copy_tests