--- spamass-milter.sh.dist	Wed Feb 18 20:38:01 2004
+++ spamass-milter.sh	Sat May  1 15:49:11 2004
@@ -2,28 +2,22 @@
 
 DAEMON=/usr/local/sbin/spamass-milter
 SOCKET=/var/run/spamass-milter.sock
-PIDFILE=/var/run/spamass-milter.pid
 
 case "$1" in
 start)
 	if [ -f "${DAEMON}" -a -x "${DAEMON}" ]
 	then
-		"${DAEMON}" -p "${SOCKET}" -f &
-		echo $! > "${PIDFILE}"
+		"${DAEMON}" -p "${SOCKET}" -f
 		sleep 1
 		kill -HUP `head -1 /var/run/sendmail.pid`
 		echo -n ' spamass-milter'
 	fi
 ;;
 stop)
-	if [ -f "${PIDFILE}" ]
-	then
-		read -r pid junk < "${PIDFILE}"
-		kill ${pid}
-		rm -f "${SOCKET}" "${PIDFILE}"
-		sleep 1
-		kill -HUP `head -1 /var/run/sendmail.pid`
-		echo -n ' spamass-milter'
-	fi
+	killall $(basename ${DAEMON})
+	rm -f "${SOCKET}"
+	sleep 1
+	kill -HUP `head -1 /var/run/sendmail.pid`
+	echo -n ' spamass-milter'
 ;;
 esac