updated rebased ldap patch from fedora (adds AccountClass ldap.conf param)

[packages/openssh.git] / opensshd.upstart

diff --git a/opensshd.upstart b/opensshd.upstart
index 79c0bdb77533fd0d91c145deca5c824fd3137ada..7836e17c9db46f7e7ca3535f64bf5080f6dd4046 100644 (file)
--- a/opensshd.upstart
+++ b/opensshd.upstart
@@ -1,19 +1,30 @@
 
-start on pld.network-started and started SERVICE=syslog
+start on pld.network-started and started SERVICE_syslog=y and started random
 stop on pld.shutdown-started
 
 respawn
-
+respawn limit 10 5
 console output
+oom never
+
+pre-start script
+       test -x /usr/sbin/sshd || { stop; exit 0; }
+       test -c /dev/null || { stop; exit 0; }
+
+       if [ ! -s /etc/ssh/ssh_host_key \
+               -o ! -s /etc/ssh/ssh_host_rsa_key \
+               -o ! -s /etc/ssh/ssh_host_dsa_key \
+               -o ! -s /etc/ssh/ssh_host_ecdsa_key \
+       ]; then
+               # call gen keys if any of the files above is missing or empty
+               /etc/rc.d/init.d/sshd ssh_gen_keys
+       fi
+end script
 
 script
        . /etc/rc.d/init.d/functions
        . /etc/sysconfig/network
 
-       if [ ! -s /etc/ssh/ssh_host_key ] ; then
-               /etc/rc.d/init.d/sshd init
-       fi
-
        if is_yes "$IPV4_NETWORKING" && is_no "$IPV6_NETWORKING"; then
                OPTIONS="$OPTIONS -4"
        fi
@@ -21,8 +32,5 @@ script
                OPTIONS="$OPTIONS -6"
        fi
 
-       exec /usr/sbin/sshd $OPTIONS
+       exec /usr/sbin/sshd -D $OPTIONS
 end script
-expect daemon
-
-# vi: ft=upstart