From 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 7 Aug 2011 23:14:33 +0000
Subject: Sun Aug  7 23:14:33 UTC 2011

---
 extra/cyrus-sasl/saslauthd | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'extra/cyrus-sasl/saslauthd')

diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd
index c470c801c..6afafae0b 100644
--- a/extra/cyrus-sasl/saslauthd
+++ b/extra/cyrus-sasl/saslauthd
@@ -8,33 +8,32 @@
 
 DAEMON_NAME="saslauthd"
 SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN`
+SASLAUTHD_RUN=/var/run/saslauthd
+SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
 
 case "$1" in
   start)
     stat_busy "Starting $DAEMON_NAME"
-    [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS
-    if [ $? -gt 0 ]; then
+    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
+    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
+      add_daemon $DAEMON_NAME
+      stat_done
+    else
       stat_fail
       exit 1
-    else
-      echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid
     fi
-    add_daemon $DAEMON_NAME
-    stat_done
     ;;
 
   stop)
     stat_busy "Stopping $DAEMON_NAME"
-    [ ! -z "$SASLAUTHD_PID" ]  && kill $SASLAUTHD_PID &> /dev/null
+    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
     if [ $? -gt 0 ]; then
       stat_fail
       exit 1
     else
-      rm /var/run/$DAEMON_NAME.pid &> /dev/null
+      rm_daemon $DAEMON_NAME
+      stat_done
     fi
-    rm_daemon $DAEMON_NAME
-    stat_done
     ;;
 
   restart)
-- 
cgit v1.2.3-54-g00ecf