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
       forwarding. Prevents the server from killing the connection if too
       much data is queued and an excessively large packet gets sent
       (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
+  * 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).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 12 Jan 2008 09:11:08 +0000
 
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
 
 . /lib/lsb/init-functions
 
+if [ -n "$2" ]; then
+    SSHD_OPTS="$SSHD_OPTS $2"
+fi
+
 # Are we running from init?
 run_by_init() {
     ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]