From d4181e15b03171d1363cd9d7a50b209697a80b01 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 26 Jun 2017 10:18:26 +0100 Subject: Test configuration before starting or reloading sshd under systemd (closes: #865770). --- debian/changelog | 7 +++++++ debian/systemd/ssh.service | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 976ec4c42..d87e26fb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openssh (1:7.5p1-6) UNRELEASED; urgency=medium + + * Test configuration before starting or reloading sshd under systemd + (closes: #865770). + + -- Colin Watson Mon, 26 Jun 2017 10:09:28 +0100 + openssh (1:7.5p1-5) unstable; urgency=medium * Upload to unstable. diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service index 3df8c6426..c75e59057 100644 --- a/debian/systemd/ssh.service +++ b/debian/systemd/ssh.service @@ -5,7 +5,9 @@ ConditionPathExists=!/etc/ssh/sshd_not_to_be_run [Service] EnvironmentFile=-/etc/default/ssh +ExecStartPre=/usr/sbin/sshd -t ExecStart=/usr/sbin/sshd -D $SSHD_OPTS +ExecReload=/usr/sbin/sshd -t ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=on-failure -- cgit v1.2.3