- (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by

   Pekka Savola <pekkas@netcore.fi>

diff --git a/ChangeLog b/ChangeLog
index daec39a175926cfaaa29dbb6a9131ca4c61bfcce..bb6d12678da12d3c2fa84f24440bb9ada4e3346f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    Carson Gaspar <carson@taltos.org>
  - (bal) arpa/nameser.h does not exist on Cygwin.  Patch by Corinna 
    Vinschen <vinschen@redhat.com>
+ - (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by
+   Pekka Savola <pekkas@netcore.fi>
 
 20010425
  - OpenBSD CVS Sync

diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index c9c1c7bfe5f79ea856a57584b14ad8778695924e..efedbfb85dd41af162ca61bf1fd96964e7aa69fc 100755 (executable)
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -15,6 +15,8 @@
 # source function library
 . /etc/rc.d/init.d/functions
 
+[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
+
 RETVAL=0
 
 # Some functions to make the below more readable
@@ -104,7 +106,7 @@ case "$1" in
                
                echo -n "Starting sshd: "
                if [ ! -f $PID_FILE ] ; then
-                       sshd
+                       sshd $OPTIONS
                        RETVAL=$?
                        if [ "$RETVAL" = "0" ] ; then
                                my_success "sshd startup" "sshd"