--- spamd/pld-rc-script.sh.old	Sun Sep  8 17:41:55 2002
+++ spamd/pld-rc-script.sh	Sun Sep  8 17:42:27 2002
@@ -4,11 +4,11 @@
 #
 # chkconfig: 2345 80 30
 #
-# description: spamd is a daemon process which uses SpamAssassin to check
-#              email messages for SPAM.  It is normally called by spamc
-#	           from a MDA.
-# processname:	spamassassin
-# pidfile:	/var/run/spamassassin.pid
+# description: spamd is a daemon process which uses SpamAssassin to check \
+#              email messages for SPAM.  It is normally called by spamc \
+#              from a MDA.
+# processname: spamassassin
+# pidfile:     /var/run/spamassassin.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -33,7 +33,7 @@
 	# Start daemon.
 	if [ ! -f /var/lock/subsys/spamd ]; then
 		msg_starting SpamAssassin
-		daemon spamd -d -c -a
+		daemon spamd $SPAMD_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
 	else
@@ -43,12 +43,12 @@
   stop)
 	# Stop daemons.
 	if [ -f /var/lock/subsys/spamd ]; then
-		echo -n "Shutting down spamd: "
+		msg_stopping SpamAssassin
 		killproc spamd
 		RETVAL=$?
 		rm -f /var/lock/subsys/spamd
 	else
-		msg_Already_Running SpamAssassin
+		msg_Not_Running SpamAssassin
 	fi
 	;;
   restart)