2 files changed, 4 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 36b9d7cd9..a151b6c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openssh (1:4.3p2-11) UNRELEASED; urgency=low
   * Use dpkg-query to fetch conffile md5sums rather than parsing
     /var/lib/dpkg/status directly.
   * openssh-client Suggests: libpam-ssh (closes: #427840).
+  * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
+    exits successfully if sshd is already running (closes: #426858).
 
   * Apply results of debconf templates and package descriptions review by
     debian-l10n-english (closes: #420107, #420742).
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 60d974f5d..f93150390 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -39,7 +39,7 @@ case "$1" in
         check_for_no_start
         check_privsep_dir
         echo -n "Starting OpenBSD Secure Shell server: sshd"
-        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
+        start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;
   stop)
@@ -62,7 +62,7 @@ case "$1" in
         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
-        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
+        start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;