summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.init4
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
7 * Use dpkg-query to fetch conffile md5sums rather than parsing 7 * Use dpkg-query to fetch conffile md5sums rather than parsing
8 /var/lib/dpkg/status directly. 8 /var/lib/dpkg/status directly.
9 * openssh-client Suggests: libpam-ssh (closes: #427840). 9 * openssh-client Suggests: libpam-ssh (closes: #427840).
10 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
11 exits successfully if sshd is already running (closes: #426858).
10 12
11 * Apply results of debconf templates and package descriptions review by 13 * Apply results of debconf templates and package descriptions review by
12 debian-l10n-english (closes: #420107, #420742). 14 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
39 check_for_no_start 39 check_for_no_start
40 check_privsep_dir 40 check_privsep_dir
41 echo -n "Starting OpenBSD Secure Shell server: sshd" 41 echo -n "Starting OpenBSD Secure Shell server: sshd"
42 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS 42 start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
43 echo "." 43 echo "."
44 ;; 44 ;;
45 stop) 45 stop)
@@ -62,7 +62,7 @@ case "$1" in
62 echo -n "Restarting OpenBSD Secure Shell server: sshd" 62 echo -n "Restarting OpenBSD Secure Shell server: sshd"
63 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid 63 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
64 check_for_no_start 64 check_for_no_start
65 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS 65 start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
66 echo "." 66 echo "."
67 ;; 67 ;;
68 68