From: Gerald Carter <jerry@samba.org>
Date: Fri, 18 Mar 2005 15:58:47 +0000 (+0000)
Subject: r5884: require cups to build and install; remove restruction from winbindd.init to... 
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd7237f50afc54b826b784bd4635ef232a3ee16a;p=thirdparty%2Fsamba.git

r5884: require cups to build and install; remove restruction from winbindd.init to have 'idmap [g|u]id' range set in smb.conf
---

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index d5124d05edb..dc15a5acc3e 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -16,8 +16,8 @@ Source998: filter-requires-samba_rh8.sh
 Source999: filter-requires-samba_rh9.sh
 
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
-Requires: pam openldap krb5-libs 
-BuildRequires: openldap-devel krb5-devel pam-devel
+Requires: pam openldap krb5-libs cups
+BuildRequires: openldap-devel krb5-devel pam-devel cups-devel
 Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
@@ -90,6 +90,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
 	--with-fhs \
 	--with-quotas \
 	--with-smbmount \
+	--enable-cups \
 	--with-pam \
 	--with-pam_smbpass \
 	--with-syslog \
diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init
index 1635dca93be..289ca590834 100644
--- a/packaging/RedHat/winbind.init
+++ b/packaging/RedHat/winbind.init
@@ -26,11 +26,8 @@ CONFIG=/etc/samba/smb.conf
 
 start() {
 	echo -n "Starting Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		daemon winbindd 
-		RETVAL=$?
-	fi
+	daemon winbindd 
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
 	   RETVAL=1
@@ -38,11 +35,8 @@ start() {
 }	
 stop() {
 	echo -n "Shutting down Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		killproc winbindd
-		RETVAL=$?
-	fi
+	killproc winbindd
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbind
 	return $RETVAL