- up to 7.7p1

[packages/openssh.git] / opensshd.init

diff --git a/opensshd.init b/opensshd.init
old mode 100644 (file)
new mode 100755 (executable)
index 77d9d6a..fe09962
--- a/opensshd.init
+++ b/opensshd.init
@@ -2,7 +2,7 @@
 #
 # sshd         sshd (secure shell daemon)
 #
-# chkconfig:   345 21 89
+# chkconfig:   345 22 88
 #
 # 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 \
@@ -11,12 +11,11 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-upstart_controlled --except init configtest
-
 # Get network config
 . /etc/sysconfig/network
 
 SSHD_OOM_ADJUST=-1000
+PIDFILE=/var/run/sshd.pid
 
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
@@ -32,8 +31,8 @@ else
 fi
 
 adjust_oom() {
-       if [ -e /var/run/sshd.pid ]; then
-               for pid in $(cat /var/run/sshd.pid); do
+       if [ -e $PIDFILE ]; then
+               for pid in $(cat $PIDFILE); do
                        echo "$SSHD_OOM_ADJUST" 2>/dev/null > /proc/$pid/oom_score_adj
                done
        fi
@@ -45,39 +44,19 @@ checkconfig() {
 }
 
 ssh_gen_keys() {
-       # generate new keys with empty passwords if they do not exist
-       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 '' >&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 '' >&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 '' >&2
-               chmod 600 /etc/ssh/ssh_host_dsa_key
-               [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_dsa_key
-       fi
-       if [ ! -f /etc/ssh/ssh_host_ecdsa_key -o ! -s /etc/ssh/ssh_host_ecdsa_key ]; then
-               /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' >&2
-               chmod 600 /etc/ssh/ssh_host_ecdsa_key
-               [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key
-       fi # ecdsa
+       @@LIBEXECDIR@@/sshd-keygen
 }
 
 start() {
        # Check if the service is already running?
-       if [ -f /var/lock/subsys/sshd ]; then
+       if status --pidfile $PIDFILE sshd >/dev/null; then
                msg_already_running "OpenSSH"
                return
        fi
 
        checkconfig
 
-       if [ ! -s /etc/ssh/ssh_host_key ]; then
+       if [ "$(echo /etc/ssh/ssh_host*key)" = "/etc/ssh/ssh_host*key" ]; then
                msg_not_running "OpenSSH"
                nls "No SSH host key found! You must run \"%s init\" first." "$0"
                exit 1
@@ -91,7 +70,7 @@ start() {
        fi
 
        msg_starting "OpenSSH"
-       daemon --pidfile /var/run/sshd.pid /usr/sbin/sshd $OPTIONS
+       daemon --pidfile $PIDFILE /usr/sbin/sshd $OPTIONS
        RETVAL=$?
        adjust_oom
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
@@ -107,7 +86,7 @@ stop() {
        # 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
+       start-stop-daemon --stop --quiet --pidfile $PIDFILE && ok || fail
        rm -f /var/lock/subsys/sshd >/dev/null 2>&1
 }
 
@@ -166,7 +145,7 @@ case "$1" in
        ssh_gen_keys
        ;;
   status)
-       status sshd
+       status --pidfile $PIDFILE sshd
        exit $?
        ;;
   *)