- rel 2.2; builds with gcc4, but stripping mamfaults (at least on amd64)

[packages/cyrus-sasl.git] / saslauthd.init

diff --git a/saslauthd.init b/saslauthd.init
index 856ae663bbf705b525c9a58dbeb1022ea8da7b4e..11d1f8e3c3a21564332ac08bf58c0cc920a579fc 100644 (file)
--- a/saslauthd.init
+++ b/saslauthd.init
@@ -15,11 +15,11 @@
 # Get service config
 [ -f /etc/sysconfig/saslauthd ] && . /etc/sysconfig/saslauthd
 
-if [ "x$SASL_AUTHMECH" != "x" ] ; then
+if [ "x$SASL_AUTHMECH" != "x" ]; then
        SASLAUTHD_OPTS="$SASLAUTHD_OPTS -a $SASL_AUTHMECH"
 fi
 
-if [ "x$SASL_RIMAP_HOSTNAME" != "x" ] ; then
+if [ "x$SASL_RIMAP_HOSTNAME" != "x" ]; then
        SASLAUTHD_OPTS="$SASLAUTHD_OPTS -H $SASL_RIMAP_HOSTNAME"
 fi
 
@@ -27,19 +27,18 @@ fi
 #      SASLAUTHD_OPTS="$SASLAUTHD_OPTS -T"
 #fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/saslauthd ]; then
-               msg_starting salsauthd
+               msg_starting saslauthd
                daemon saslauthd $SASLAUTHD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/saslauthd
        else
                msg_already_running saslauthd
-               exit 1
        fi
        ;;
   stop)
@@ -50,25 +49,20 @@ case "$1" in
                rm -f /var/lock/subsys/saslauthd /var/run/saslauthd.pid >/dev/null 2>&1
        else
                msg_not_running saslauthd
-               exit 1
        fi
        ;;
   status)
        status saslauthd
        exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
-       ;;
-  force-reload)
-       $0 stop && $0 start
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
-       ;;
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL