From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Thu, 19 Jan 2023 07:53:45 +0000 (+0000)
Subject: upstream: Check if we can copy sshd or need to use sudo to do so
X-Git-Tag: V_9_2_P1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=405fba71962dec8409c0c962408e09049e5624b5;p=thirdparty%2Fopenssh-portable.git

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
---

diff --git a/regress/reexec.sh b/regress/reexec.sh
index 8966ba524..3f88d41f5 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