tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 19:08:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
here

OpenBSD-Regress-ID: 96fec579af228f87a036e94801eb294af9074625
This commit is contained in:
djm@openbsd.org 2024-06-11 01:58:27 +00:00 committed by Damien Miller
parent 90fb801e2d
commit b0a711c00b
No known key found for this signature in database
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/test-exec.sh
View File

@ -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. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -456,6 +456,7 @@ make_tmpdir ()
stop_sshd () stop_sshd ()
{ {
[ -z $PIDFILE ] && return
[ -f $PIDFILE ] || return [ -f $PIDFILE ] || return
pid=`$SUDO cat $PIDFILE` pid=`$SUDO cat $PIDFILE`
if [ "X$pid" = "X" ]; then if [ "X$pid" = "X" ]; then
@ -874,6 +875,7 @@ chmod a+x $OBJ/ssh_proxy.sh
start_sshd () start_sshd ()
{ {
PIDFILE=$OBJ/pidfile
# start sshd # start sshd
logfile="${TEST_SSH_LOGDIR}/sshd.`$OBJ/timestamp`.$$.log" logfile="${TEST_SSH_LOGDIR}/sshd.`$OBJ/timestamp`.$$.log"
$SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"