From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Jan 2021 11:12:03 +0000 (+0000)
Subject: ssh: Ignore any errors when stopping daemon
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=675c9ca558f3d354127c4746fed187b3ff4380cd;p=people%2Fmfischer%2Fipfire-2.x.git

ssh: Ignore any errors when stopping daemon

The SSH init script only kills the main daemon which leads to any child
processes (for remaining connections) being untouched.

killproc returns 4 (unknown error) when not all processes were killed
which is not intended here. Therefore we ignore the error and do not
pause the shut down process for a minute.

Fixes: #12544
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/initscripts/system/sshd b/src/initscripts/system/sshd
index c3c02adc1b..d0d859118c 100644
--- a/src/initscripts/system/sshd
+++ b/src/initscripts/system/sshd
@@ -37,7 +37,7 @@ case "$1" in
 
     stop)
         boot_mesg "Stopping SSH Server..."
-        killproc -p "/var/run/sshd.pid" /usr/sbin/sshd
+        killproc -p "/var/run/sshd.pid" /usr/sbin/sshd || true
         ;;
 
     reload)