2 files changed, 4 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 20f685d5d..eb3884e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openssh (1:3.6.1p2-6) UNRELEASED; urgency=low
   * Use a more CVS-friendly means of setting SSH_VERSION.
   * Update Brazilian Portuguese debconf template translation (thanks, Andre
     Luis Lopes; closes: #208036).
+  * Don't run 'sshd -t' in init script if the server isn't to be run
+    (closes: #197576).
 
  -- Colin Watson <cjwatson@debian.org>  Mon,  1 Sep 2003 23:56:57 +0100
 
diff --git a/debian/init b/debian/init
index 0eddf722e..641b9eff5 100644
--- a/debian/init
+++ b/debian/init
@@ -27,7 +27,9 @@ check_privsep_dir() {
 }
 
 check_config() {
+    if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then
         /usr/sbin/sshd -t || exit 1
+    fi
 }
 
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"