From 7de0a9c21ecdb7becae761d7c9f2e723cb9ae0d3 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 17 Jan 2012 23:14:55 +0000
Subject: Tue Jan 17 23:14:54 UTC 2012

---
 extra/spamassassin/spamd | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'extra/spamassassin/spamd')

diff --git a/extra/spamassassin/spamd b/extra/spamassassin/spamd
index 11d35f7cd..3fb97566e 100644
--- a/extra/spamassassin/spamd
+++ b/extra/spamassassin/spamd
@@ -6,11 +6,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
+PIDFILE=/var/run/spamd.pid
+if [ -f $PIDFILE ]; then
+  PID=$(cat $PIDFILE)
+else
+  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
+fi
+
 case "$1" in
   start)
     stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS}
+    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
     if [ $? -gt 0 ]; then
       stat_fail
     else
-- 
cgit v1.2.3-54-g00ecf