- merge samba3-common into samba4-common, the're dependant on each other

[packages/samba.git] / winbind.init

diff --git a/winbind.init b/winbind.init
index 44392867078c8ac863ab8e5a430e4ce7dc47d3ca..a421fdecacfcecad8f9c77411eabd58a441602f0 100644 (file)
--- a/winbind.init
+++ b/winbind.init
@@ -32,23 +32,14 @@ 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 -qi '^idmap [ug]id' /etc/samba/smb.conf
-}
-
 start() {
        if [ ! -f /var/lock/subsys/winbind ]; then
-               if configtest; then
-                       msg_starting winbindd
-                       daemon /usr/sbin/winbindd
-                       RETVAL=$?
-                       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"
+               msg_starting winbindd
+               daemon /usr/sbin/winbindd
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       touch /var/lock/subsys/winbind
+                       RETVAL=1
                fi
        else
                msg_already_running winbindd