tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Don't call fatal from stop_sshd since it calls cleanup
which calls stop_sshd which will probably fail in the same way.  Instead,
just bail. Differentiate between sshd dying without cleanup and not shutting
down.

Upstream-Regress-ID: f97315f538618b349e2b0bea02d6b0c9196c6bc4
This commit is contained in:
dtucker@openbsd.org 2017-07-28 10:32:08 +00:00 committed by Damien Miller
parent aea59a0d9f
commit 239c57d5bc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.60 2017/04/30 23:34:55 djm Exp $ # $OpenBSD: test-exec.sh,v 1.61 2017/07/28 10:32:08 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -304,8 +304,15 @@ stop_sshd ()
i=`expr $i + 1` i=`expr $i + 1`
sleep $i sleep $i
done done
test -f $PIDFILE && \ if test -f $PIDFILE; then
fatal "sshd didn't exit port $PORT pid $pid" if $SUDO kill -0 $pid; then
echo "sshd didn't exit " \
"port $PORT pid $pid"
else
echo "sshd died without cleanup"
fi
exit 1
fi
fi fi
fi fi
fi fi