Skip to content

Commit

Permalink
upstream: fix PIDFILE handling, broken for SUDO=doas in last commit
Browse files Browse the repository at this point in the history
here

OpenBSD-Regress-ID: 96fec579af228f87a036e94801eb294af9074625
  • Loading branch information
djmdjm committed Jun 11, 2024
1 parent 90fb801 commit b0a711c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion regress/test-exec.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -456,6 +456,7 @@ make_tmpdir ()

stop_sshd ()
{
[ -z $PIDFILE ] && return
[ -f $PIDFILE ] || return
pid=`$SUDO cat $PIDFILE`
if [ "X$pid" = "X" ]; then
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit b0a711c

Please sign in to comment.