packages: samba/samba.spec, samba/winbind.init - rel 3 - removed configtest...

[baggins]

Author: baggins                      Date: Thu Nov  5 15:19:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/samba:
   samba.spec (1.464 -> 1.465) , winbind.init (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.464 packages/samba/samba.spec:1.465
--- packages/samba/samba.spec:1.464	Wed Oct 28 17:10:24 2009
+++ packages/samba/samba.spec	Thu Nov  5 16:19:09 2009
@@ -32,7 +32,7 @@
 Summary(zh_CN.UTF-8):	Samba 客户端和服务器
 Name:		samba
 Version:	3.4.0
-Release:	2
+Release:	3
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
@@ -1575,6 +1575,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.465  2009/11/05 15:19:09  baggins
+- 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
+
 Revision 1.464  2009/10/28 16:10:24  sls
 - BR: keyutils-devel (this time it's explicitly required by configure)
 

================================================================
Index: packages/samba/winbind.init
diff -u packages/samba/winbind.init:1.10 packages/samba/winbind.init:1.11
--- packages/samba/winbind.init:1.10	Wed Oct 15 00:09:08 2008
+++ packages/samba/winbind.init	Thu Nov  5 16:19:09 2009
@@ -32,23 +32,14 @@
 # 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.464&r2=1.465&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/winbind.init?r1=1.10&r2=1.11&f=u