packages: cyrus-sasl/saslauthd.init - sync with template.init

[glen]

Author: glen                         Date: Mon Apr  5 19:16:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sync with template.init

---- Files affected:
packages/cyrus-sasl:
   saslauthd.init (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/cyrus-sasl/saslauthd.init
diff -u packages/cyrus-sasl/saslauthd.init:1.11 packages/cyrus-sasl/saslauthd.init:1.12
--- packages/cyrus-sasl/saslauthd.init:1.11	Tue Feb  3 16:36:18 2009
+++ packages/cyrus-sasl/saslauthd.init	Mon Apr  5 21:16:07 2010
@@ -1,18 +1,33 @@
 #!/bin/sh
 #
-# saslauthd	SASL AUTH Daemon
+# saslauthd	saslauthd short service description
 #
 # chkconfig:	2345 40 60
+#
 # description:	SASL AUTH Daemon
+#
 # processname:	saslauthd
 # pidfile:	/var/lib/sasl2/saslauthd.pid
-
+#
 # $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
-# Get service config
+# Get network config
+. /etc/sysconfig/network
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down "SASL AUTH Daemon"
+		exit 1
+	fi
+else
+	exit 0
+fi
+
+# Get service config - may override defaults
 [ -f /etc/sysconfig/saslauthd ] && . /etc/sysconfig/saslauthd
 
 if [ "$SASL_AUTHMECH" ]; then
@@ -32,44 +47,49 @@
 fi
 
 start() {
-	if [ ! -f /var/lock/subsys/saslauthd ]; then
-		msg_starting saslauthd
-		daemon /usr/sbin/saslauthd $SASLAUTHD_OPTS
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/saslauthd
-	else
-		msg_already_running saslauthd
+	# Check if the service is already running?
+	if [ -f /var/lock/subsys/saslauthd ]; then
+		msg_already_running "SASL AUTH Daemon"
+		return
 	fi
+
+	msg_starting "SASL AUTH Daemon"
+	daemon /usr/sbin/saslauthd $SASLAUTHD_OPTS
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/saslauthd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/saslauthd ]; then
-		msg_stopping saslauthd
-		killproc saslauthd
-		rm -f /var/lock/subsys/saslauthd /var/lib/sasl2/saslauthd.pid >/dev/null 2>&1
-	else
-		msg_not_running saslauthd
+	if [ ! -f /var/lock/subsys/saslauthd ]; then
+		msg_not_running "SASL AUTH Daemon"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "SASL AUTH Daemon"
+	killproc saslauthd
+	rm -f /var/lock/subsys/saslauthd /var/lib/sasl2/saslauthd.pid >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/saslauthd ]; then
-		stop
-		start
-	else
-		msg_not_running saslauthd
+	if [ ! -f /var/lock/subsys/saslauthd ]; then
+		msg_not_running "SASL AUTH Daemon"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-	start
+  	start
 	;;
   stop)
-	stop
+  	stop
 	;;
   restart)
 	stop
@@ -83,7 +103,7 @@
 	;;
   status)
 	status saslauthd
-	exit $?
+	RETVAL=$?
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/saslauthd.init?r1=1.11&r2=1.12&f=u