diff options
| author | Gerald Carter <jerry@samba.org> | 2005-03-18 15:58:47 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-03-18 15:58:47 +0000 |
| commit | d7a818e24516f453b9524288b51ef5fd4bdc82b2 (patch) | |
| tree | c4361318c6d381161b06b171c2069d9f56ea3b0c | |
| parent | 82d0b42d502f62c1a5e4a3fcf02144f882b5e45b (diff) | |
| download | samba-d7a818e24516f453b9524288b51ef5fd4bdc82b2.tar.gz samba-d7a818e24516f453b9524288b51ef5fd4bdc82b2.tar.xz samba-d7a818e24516f453b9524288b51ef5fd4bdc82b2.zip | |
r5884: require cups to build and install; remove restruction from winbindd.init to have 'idmap [g|u]id' range set in smb.conf
| -rw-r--r-- | packaging/RedHat/samba.spec.tmpl | 5 | ||||
| -rw-r--r-- | packaging/RedHat/winbind.init | 14 |
2 files changed, 7 insertions, 12 deletions
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 |