- unify

Changed files:
    auditd.init -> 1.8

diff --git a/auditd.init b/auditd.init
index c5fc65a3e9bfe0ff83e24176a07bdce33de74da3..8c4f9f5950b49c085f46205befa61e40d81315c9 100644 (file)
--- a/auditd.init
+++ b/auditd.init
@@ -23,41 +23,56 @@ AUDIT_RULES=/etc/audit/audit.rules
 [ -f /etc/sysconfig/auditd ] && . /etc/sysconfig/auditd
 
 start() {
-       if [ ! -f /var/lock/subsys/auditd ]; then
-               msg_starting auditd
-               unset HOME MAIL USER USERNAME
-               daemon /sbin/auditd "$EXTRAOPTIONS"
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd
-               # Load the default rules
-               [ -f $AUDIT_RULES ] && /sbin/auditctl -R $AUDIT_RULES >/dev/null
-       else
+       if [ -f /var/lock/subsys/auditd ]; then
                msg_already_running auditd
+               return
        fi
+
+       msg_starting auditd
+       unset HOME MAIL USER USERNAME
+       daemon /sbin/auditd "$EXTRAOPTIONS"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd
+       # Load the default rules
+       [ -f $AUDIT_RULES ] && /sbin/auditctl -R $AUDIT_RULES >/dev/null
 }
 
 stop() {
-       if [ -f /var/lock/subsys/auditd ]; then
-               msg_stopping auditd
-               killproc auditd
-               rm -f /var/lock/subsys/auditd
-               # Remove watches so shutdown works cleanly
-               if ! is_no "$AUDITD_CLEAN_STOP"; then
-                       /sbin/auditctl -D >/dev/null
-               fi
-       else
+       if [ ! -f /var/lock/subsys/auditd ]; then
                msg_not_running auditd
+               return
+       fi
+
+       msg_stopping auditd
+       killproc auditd
+       rm -f /var/lock/subsys/auditd
+       # Remove watches so shutdown works cleanly
+       if ! is_no "$AUDITD_CLEAN_STOP"; then
+               /sbin/auditctl -D >/dev/null
        fi
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/auditd ]; then
-               stop
-               start
-       else
+       if [ ! -f /var/lock/subsys/auditd ]; then
                msg_not_running auditd
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/auditd ]; then
+               msg_not_running auditd
+               RETVAL=7
+               return
+       fi
+
+       msg_reloading auditd
+       killproc auditd -HUP
+       RETVAL=$?
 }
 
 RETVAL=0
@@ -76,14 +91,7 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/auditd ]; then
-               msg_reloading auditd
-               killproc auditd -HUP
-               RETVAL=$?
-       else
-               msg_not_running auditd
-               RETVAL=7
-       fi
+       reload
        ;;
   status)
        status auditd