summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/systemd/ssh.service2
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 @@
1openssh (1:7.5p1-6) UNRELEASED; urgency=medium
2
3 * Test configuration before starting or reloading sshd under systemd
4 (closes: #865770).
5
6 -- Colin Watson <cjwatson@debian.org> Mon, 26 Jun 2017 10:09:28 +0100
7
1openssh (1:7.5p1-5) unstable; urgency=medium 8openssh (1:7.5p1-5) unstable; urgency=medium
2 9
3 * Upload to unstable. 10 * 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
5 5
6[Service] 6[Service]
7EnvironmentFile=-/etc/default/ssh 7EnvironmentFile=-/etc/default/ssh
8ExecStartPre=/usr/sbin/sshd -t
8ExecStart=/usr/sbin/sshd -D $SSHD_OPTS 9ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
10ExecReload=/usr/sbin/sshd -t
9ExecReload=/bin/kill -HUP $MAINPID 11ExecReload=/bin/kill -HUP $MAINPID
10KillMode=process 12KillMode=process
11Restart=on-failure 13Restart=on-failure