From 85b8cabefa29845fb1174d8528bee37636f5b7b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 14 Oct 2008 22:08:15 +0000
Subject: [PATCH] - simplify

Changed files:
    winbind.init -> 1.9
---
 winbind.init | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/winbind.init b/winbind.init
index 8497e91..2904f98 100644
--- a/winbind.init
+++ b/winbind.init
@@ -32,14 +32,21 @@ TMPDIR="/tmp"; export TMPDIR
 # 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
-- 
2.44.0