summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-02-01 21:56:43 +0000
committerColin Watson <cjwatson@debian.org>2008-02-01 21:56:43 +0000
commite1de8aeae4cb2665e20af41fe1a9f57b555ba934 (patch)
treed6f04a8a3b022a6021a301724453711876b7110a
parentd577a83a31e9938ca46fe15ef0bfb2b09722832a (diff)
* Allow passing temporary daemon parameters on the init script's command
line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks, Marc Haber; closes: #458547).
-rw-r--r--debian/changelog3
-rw-r--r--debian/openssh-server.init4
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d2c6dea57..689178968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ openssh (1:4.7p1-3) UNRELEASED; urgency=low
6 forwarding. Prevents the server from killing the connection if too 6 forwarding. Prevents the server from killing the connection if too
7 much data is queued and an excessively large packet gets sent 7 much data is queued and an excessively large packet gets sent
8 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360). 8 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
9 * Allow passing temporary daemon parameters on the init script's command
10 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
11 Marc Haber; closes: #458547).
9 12
10 -- Colin Watson <cjwatson@debian.org> Sat, 12 Jan 2008 09:11:08 +0000 13 -- Colin Watson <cjwatson@debian.org> Sat, 12 Jan 2008 09:11:08 +0000
11 14
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 7706b6c39..67b204789 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -22,6 +22,10 @@ fi
22 22
23. /lib/lsb/init-functions 23. /lib/lsb/init-functions
24 24
25if [ -n "$2" ]; then
26 SSHD_OPTS="$SSHD_OPTS $2"
27fi
28
25# Are we running from init? 29# Are we running from init?
26run_by_init() { 30run_by_init() {
27 ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] 31 ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]