2 files changed, 9 insertions, 0 deletions

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 <cjwatson@debian.org>  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