From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 11 Jun 2024 01:58:27 +0000 (+0000)
Subject: upstream: fix PIDFILE handling, broken for SUDO=doas in last commit
X-Git-Tag: V_9_8_P1~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0a711c00b9c64afd1c9d6fb538275c6604a2676;p=thirdparty%2Fopenssh-portable.git

upstream: fix PIDFILE handling, broken for SUDO=doas in last commit

here

OpenBSD-Regress-ID: 96fec579af228f87a036e94801eb294af9074625
---

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 69541136c..e483bc2aa 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.114 2024/06/06 19:48:40 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.115 2024/06/11 01:58:27 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -456,6 +456,7 @@ make_tmpdir ()
 
 stop_sshd ()
 {
+	[ -z $PIDFILE ] && return
 	[ -f $PIDFILE ] || return
 	pid=`$SUDO cat $PIDFILE`
 	if [ "X$pid" = "X" ]; then
@@ -874,6 +875,7 @@ chmod a+x $OBJ/ssh_proxy.sh
 
 start_sshd ()
 {
+	PIDFILE=$OBJ/pidfile
 	# start sshd
 	logfile="${TEST_SSH_LOGDIR}/sshd.`$OBJ/timestamp`.$$.log"
 	$SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"