- unify, simplify

Changed files:
    spamassassin-spamd.init -> 1.6

diff --git a/spamassassin-spamd.init b/spamassassin-spamd.init
index cc79ba8fb0eb896dd43e5d1c8c7ed0536abfe02e..1a50191ef26db51dd6d7bbd2dce98fa499cd3e22 100644 (file)
--- a/spamassassin-spamd.init
+++ b/spamassassin-spamd.init
@@ -24,32 +24,34 @@ fi
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-       msg_network_down SpamAssassin
+       msg_network_down "SpamAssassin"
        exit 1
 fi
 
 start() {
        # Start daemon.
-       if [ ! -f /var/lock/subsys/spamd ]; then
-               msg_starting SpamAssassin
-               daemon spamd $SPAMD_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
-       else
-               msg_already_running SpamAssassin
+       if [ -f /var/lock/subsys/spamd ]; then
+               msg_already_running "SpamAssassin"
+               return
        fi
+
+       msg_starting "SpamAssassin"
+       daemon /usr/sbin/spamd $SPAMD_OPTS
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/spamd ]; then
-               msg_stopping SpamAssassin
-               killproc spamd
-               RETVAL=$?
-               rm -f /var/lock/subsys/spamd
-       else
-               msg_not_running SpamAssassin
+       if [ ! -f /var/lock/subsys/spamd ]; then
+               msg_not_running "SpamAssassin"
+               return
        fi
+
+       msg_stopping "SpamAssassin"
+       killproc spamd
+       RETVAL=$?
+       rm -f /var/lock/subsys/spamd
 }
 
 # See how we were called.