summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-27 00:46:17 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-27 00:46:17 +0000
commit26f33893a60f712b3a6fb572cde6538bfe5ce394 (patch)
treecfa4e0c93b3f047bf7d6592f04cf83be74d6198b
parente39867df6dae55096b52d4d0b60415d216e168da (diff)
- (bal) Add /etc/sysconfig/sshd support to redhat's sshd.init. Patch by
Pekka Savola <pekkas@netcore.fi>
-rw-r--r--ChangeLog4
-rwxr-xr-xcontrib/redhat/sshd.init4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b12e7bb..82f4034c 100644
--- 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
@@ -5260,4 +5262,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1174 2001/04/27 00:34:44 mouring Exp $
+$Id: ChangeLog,v 1.1175 2001/04/27 00:46:17 mouring Exp $
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index c9c1c7bf..efedbfb8 100755
--- 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"