SOURCES: winbind.init - simplify

[glen]

Author: glen                         Date: Tue Oct 14 22:08:21 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- simplify

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

---- Diffs:

================================================================
Index: SOURCES/winbind.init
diff -u SOURCES/winbind.init:1.8 SOURCES/winbind.init:1.9
--- SOURCES/winbind.init:1.8	Tue Oct 14 23:11:01 2008
+++ SOURCES/winbind.init	Wed Oct 15 00:08:15 2008
@@ -32,14 +32,21 @@
 # Check that smb.conf exists.
 [ -f /etc/samba/smb.conf ] || exit 0
 
+# return true if 'idmap uid' or 'idmap gid' is set in samba config
+configtest() {
+	egrep -qvi '^idmap [ug]id' /etc/samba/smb.conf
+}
+
 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 configtest; then
 			msg_starting winbindd
-			daemon winbindd
+			daemon /usr/sbin/winbindd
 			RETVAL=$?
-			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
-			RETVAL=1
+			if [ $RETVAL -eq 0 ]; then
+				touch /var/lock/subsys/winbind
+				RETVAL=1
+			fi
 		else
 			nls "Winbind is not configured in /etc/samba/smb.conf, not starting"
 		fi
================================================================

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