fix sshd-keygen location in on demand service; rel 2

[packages/openssh.git] / opensshd.init

diff --git a/opensshd.init b/opensshd.init
index ab59061b6e528a458878d3b90b8e1d42cd5d7d17..fe09962804e874f80f8c4aa76b3eb5772e065cf2 100755 (executable)
--- a/opensshd.init
+++ b/opensshd.init
@@ -11,8 +11,6 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-upstart_controlled --except init configtest
-
 # Get network config
 . /etc/sysconfig/network
 
@@ -46,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