* On '/etc/init.d/ssh restart', create /var/run/sshd before checking the

  server configuration, as otherwise 'sshd -t' will complain about the
  lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).

2 files changed, 4 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 1021e35a0..a85895cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 openssh (1:4.3p2-2) UNRELEASED; urgency=low
 
   * Include commented-out pam_access example in /etc/pam.d/ssh.
+  * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
+    server configuration, as otherwise 'sshd -t' will complain about the
+    lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
   * debconf template translations:
     - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
     - Update Czech (thanks, Miroslav Kure; closes: #367161).
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 552330422..60d974f5d 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -57,11 +57,11 @@ case "$1" in
         ;;
 
   restart)
+        check_privsep_dir
         check_config
         echo -n "Restarting OpenBSD Secure Shell server: sshd"
         start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
         check_for_no_start
-        check_privsep_dir
         start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;