- copy config.sub from automake

[packages/openssh.git] / opensshd.init

diff --git a/opensshd.init b/opensshd.init
index 21cf600fce413278286e086704ed0caab375f1e1..8fba73144f9688b059732a97d5567623c1bdca79 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -4,8 +4,8 @@
 #
 # chkconfig:   345 55 45
 #
-# description: sshd (secure shell daemon) is a server part of the ssh suite.
-#              Ssh can be used for remote login, remote file copying, TCP port
+# description: sshd (secure shell daemon) is a server part of the ssh suite. \
+#              Ssh can be used for remote login, remote file copying, TCP port \
 #              forwarding etc. Ssh offers strong encryption and authentication.
 
 
@@ -15,12 +15,14 @@
 # Get network config
 . /etc/sysconfig/network
 
+SERVICE_LIMITS="-u unlimited -Sc 0"
+
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
                msg_network_down OpenSSH
                exit 1
        fi
@@ -28,7 +30,7 @@ else
        exit 0
 fi
                        
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -55,7 +57,6 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/sshd ]; then
                msg_starting OpenSSH
-               ULIMIT_C="-S -c 0"
                daemon /usr/sbin/sshd 
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd                
@@ -70,21 +71,21 @@ case "$1" in
                rm -f /var/run/sshd.pid /var/lock/subsys/sshd >/dev/null 2>&1
        else
                msg_not_running OpenSSH
-               exit 1
        fi      
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status sshd
        exit $?
        ;;
   init)
-       echo "Now the SSH host key will be generated. Please note, that if you"
-       echo "will use password for the key, you will need to type it on each"
-       echo "reboot."
+       nls "Now the SSH host key will be generated. Please note, that if you"
+       nls "will use password for the key, you will need to type it on each"
+       nls "reboot."
        /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key
        chmod 600 /etc/ssh/ssh_host_key
        /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
@@ -93,13 +94,19 @@ case "$1" in
        chmod 600 /etc/ssh/ssh_host_dsa_key
        exit $?
        ;;
-  reload)
-       msg_reloading OpenSSH
-       killproc sshd -HUP
+  reload|force-reload)
+       if [ -f /var/lock/subsys/sshd ]; then
+               msg_reloading OpenSSH
+               killproc sshd -HUP
+               RETVAL=$?
+       else
+               msg_not_running OpenSSH >&2
+               exit 7
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|init|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|init|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL