Debian release 3.5p1-5.

1 files changed, 7 insertions, 2 deletions

diff --git a/debian/init b/debian/init
index ea39a8bd0..0eddf722e 100644
--- a/debian/init
+++ b/debian/init
@@ -1,10 +1,15 @@
 #! /bin/sh
+set -e
 
 # /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
 
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
+if test -f /etc/default/ssh; then
+    . /etc/default/ssh
+fi
+
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
     if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
@@ -32,7 +37,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
+        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;
   stop)
@@ -56,7 +61,7 @@ case "$1" in
         check_for_no_start
         check_privsep_dir
         sleep 2
-        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd
+        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;