packages: audit/auditd.init - unify

[glen]

Author: glen                         Date: Sat Mar  3 11:23:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify

---- Files affected:
packages/audit:
   auditd.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/audit/auditd.init
diff -u packages/audit/auditd.init:1.7 packages/audit/auditd.init:1.8
--- packages/audit/auditd.init:1.7	Sat Jan 22 15:23:35 2011
+++ packages/audit/auditd.init	Sat Mar  3 12:23:03 2012
@@ -23,41 +23,56 @@
 [ -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 @@
 	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/auditd.init?r1=1.7&r2=1.8&f=u