- fixed wrong md5

[packages/openssh.git] / opensshd.init

diff --git a/opensshd.init b/opensshd.init
index 8fba73144f9688b059732a97d5567623c1bdca79..baf7c33db57f2901cc649557057faa1aad06bcfb 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -15,8 +15,6 @@
 # Get network config
 . /etc/sysconfig/network
 
-SERVICE_LIMITS="-u unlimited -Sc 0"
-
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
 
@@ -29,7 +27,11 @@ if is_yes "${NETWORKING}"; then
 else
        exit 0
 fi
-                       
+
+checkconfig() {
+       /usr/sbin/sshd -t || exit 1
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -38,16 +40,21 @@ case "$1" in
        if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
                /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' 1>&2
                chmod 600 /etc/ssh/ssh_host_key
+               [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_key || :
        fi
        if [ ! -f /etc/ssh/ssh_host_rsa_key -o ! -s /etc/ssh/ssh_host_rsa_key ]; then
                /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' 1>&2
                chmod 600 /etc/ssh/ssh_host_rsa_key
+               [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_rsa_key || :
        fi
        if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
                /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' 1>&2
                chmod 600 /etc/ssh/ssh_host_dsa_key
+               [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_dsa_key || :
        fi
 
+       checkconfig
+
        if [ ! -f /etc/ssh/ssh_host_key ]; then
                msg_not_running OpenSSH
                nls "No SSH host key found! You must run \"%s init\" first." "$0"
@@ -57,9 +64,9 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/sshd ]; then
                msg_starting OpenSSH
-               daemon /usr/sbin/sshd 
+               daemon /usr/sbin/sshd
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd                
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
        else
                msg_already_running OpenSSH
        fi
@@ -67,13 +74,17 @@ case "$1" in
   stop)
        if [ -f /var/lock/subsys/sshd ]; then
                msg_stopping OpenSSH
-               killproc sshd
-               rm -f /var/run/sshd.pid /var/lock/subsys/sshd >/dev/null 2>&1
+               # we use start-stop-daemon to stop sshd, as it is unacceptable for such
+               # critical service as sshd to kill it by procname, but unfortunately
+               # rc-scripts does not provide way to kill *only* by pidfile
+               start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid && ok || fail
+               rm -f /var/lock/subsys/sshd >/dev/null 2>&1
        else
                msg_not_running OpenSSH
-       fi      
+       fi
        ;;
   restart)
+       checkconfig
        $0 stop
        $0 start
        exit $?
@@ -87,11 +98,14 @@ case "$1" in
        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
+       [ -x /sbin/restorecon ] && /sbin/restorecon /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
+       [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_rsa_key || :
        chmod 600 /etc/ssh/ssh_host_rsa_key
        /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
        chmod 600 /etc/ssh/ssh_host_dsa_key
+       [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_dsa_key || :
        exit $?
        ;;
   reload|force-reload)
@@ -100,7 +114,7 @@ case "$1" in
                killproc sshd -HUP
                RETVAL=$?
        else
-               msg_not_running OpenSSH >&2
+               msg_not_running OpenSSH
                exit 7
        fi
        ;;