Check that /var/run/sshd.pid exists and that the process ID listed there

corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
script; SIGHUP is racy if called at boot before sshd has a chance to
install its signal handler, but fortunately the pid file is written
after that which lets us avoid the race (closes: #502444).

1 files changed, 5 insertions, 0 deletions

diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
index c44a4d257..9b2140352 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up
@@ -25,6 +25,11 @@ if [ ! -e /usr/sbin/sshd ]; then
         exit 0
 fi
 
+if [ ! -f /var/run/sshd.pid ] || \
+   [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" = sshd ]; then
+        exit 0
+fi
+
 /etc/init.d/ssh reload >/dev/null 2>&1 || true
 
 exit 0