SOURCES: winbind.init - use functions - added try-restart

[qboosh]

Author: qboosh                       Date: Tue Oct 14 21:11:06 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions
- added try-restart

---- Files affected:
SOURCES:
   winbind.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/winbind.init
diff -u SOURCES/winbind.init:1.7 SOURCES/winbind.init:1.8
--- SOURCES/winbind.init:1.7	Tue May 30 13:40:40 2006
+++ SOURCES/winbind.init	Tue Oct 14 23:11:01 2008
@@ -32,13 +32,9 @@
 # Check that smb.conf exists.
 [ -f /etc/samba/smb.conf ] || exit 0
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-	# Check if the service is already running?
+start() {
 	if [ ! -f /var/lock/subsys/winbind ]; then
-	  	if [ "`grep -i 'idmap uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i 'idmap gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
+		if [ "`grep -i 'idmap uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i 'idmap gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
 			msg_starting winbindd
 			daemon winbindd
 			RETVAL=$?
@@ -50,9 +46,9 @@
 	else
 		msg_already_running winbindd
 	fi
-	;;
-  stop)
-	# Stop daemon.
+}
+
+stop() {
 	if [ -f /var/lock/subsys/winbind ]; then
 		msg_stopping winbindd
 		killproc winbindd
@@ -60,15 +56,30 @@
 	else
 		msg_not_running winbindd
 	fi
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/winbind ]; then
+		stop
+		start
+	else
+		msg_not_running winbindd
+		RETVAL=$1
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
 	;;
-  status)
-	status winbindd
-	RETVAL=$?
+  stop)
+	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/winbind ]; then
@@ -80,8 +91,15 @@
 		exit 7
 	fi
 	;;
+  try-restart)
+	condrestart 0
+	;;
+  status)
+	status winbindd
+	RETVAL=$?
+	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/winbind.init?r1=1.7&r2=1.8&f=u