- rel 3

- removed configtest from winbind.init, it was utterly stupid as winbindd
  can function perfectly fine without 'idmap uid/gid' configured in smb.conf.
  It's called 'netlogon proxy only mode', see man winbindd for details

Changed files:
    samba.spec -> 1.465
    winbind.init -> 1.11

diff --git a/samba.spec b/samba.spec
index 68e56e8e684edd01c5b3f51177e8616b3030847b..c8cab60e9d981b3a263545f1b366462d527ef4a3 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -31,7 +31,7 @@ Summary(uk.UTF-8):    SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
 Version:       3.4.0
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons

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