Bug#865986: stretch-pu: package openssh/1:7.4p1-10+deb9u2

[Colin Watson <cjwatson@debian.org>]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

I've committed this patch to master, but it isn't in unstable yet
because I'm waiting for openssh-ssh1 to clear NEW before I upload
openssh to unstable again, in order to avoid confusion with versions.
However, point release dates are close enough that I wanted to seek
approval for this sooner rather than later.

commit 1854b32d1b507510d51f547d24560d412ff3fa11
Author: Colin Watson <cjwatson@debian.org>
Date:   Mon Jun 26 10:18:26 2017 +0100

    Test configuration before starting or reloading sshd under systemd (closes: #865770).

diff --git a/debian/changelog b/debian/changelog
index c224e40..2229aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.4p1-10+deb9u2) UNRELEASED; urgency=medium
+
+  * Test configuration before starting or reloading sshd under systemd
+    (closes: #865770).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 26 Jun 2017 10:19:40 +0100
+
 openssh (1:7.4p1-10+deb9u1) stretch; urgency=medium
 
   * Fix incoming compression statistics (thanks, Russell Coker; closes:
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service
index 3df8c64..c75e590 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

Thanks,

-- 
Colin Watson                                       [cjwatson@debian.org]