last minute updates from Buchan

(This used to be commit 13636235af569fcdfcfc75033f30e21afb78ce05)

diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf
index 6ea6635191359b93aa4f3d11a40b2f45f35d583e..4981d22174bc0c73659983251a08676319c3bf93 100644 (file)
--- a/packaging/Mandrake/smb.conf
+++ b/packaging/Mandrake/smb.conf
@@ -233,7 +233,7 @@
 ; add user to group script = /usr/share/samba/scripts/smbldap-groupmod.pl -m '%u' '%g'
 ; delete user from group script = /usr/share/samba/scripts/smbldap-groupmod.pl -x '%u' '%g'
 ; set primary group script = /usr/share/samba/scripts/smbldap-usermod.pl -g '%g' '%u'
-; add group script = /usr/share/samba/scripts/smbldap-groupadd.pl '%g' && /usr/share/samba3/scripts/smbldap-groupshow.pl %g|awk '/^gidNumber:/ {print $2}'
+; add group script = /usr/share/samba/scripts/smbldap-groupadd.pl '%g' && /usr/share/samba/scripts/smbldap-groupshow.pl %g|awk '/^gidNumber:/ {print $2}'
 ; delete group script = /usr/share/samba/scripts/smbldap-userdel.pl '%g'
 
 
@@ -279,7 +279,6 @@
 # start_tls should run on 389, but samba defaults incorrectly to 636
 ; ldap port = 389
 ; ldap suffix = dc=mydomain,dc=com
-; ldap server = ldap.mydomain.com
 # Seperate suffixes are available for machines, users, groups, and idmap, if 
 # ldap suffix appears first, it is appended to the specific suffix.
 # Example for a unix-ish directory layout:

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index fa4b7b070b5843eb52b4edf9d04f32f5043ea65c..063af05dd38b4db9b123929e25d7e4f5c474a0d0 100644 (file)
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -416,6 +416,7 @@ fi
 %attr(755,root,root) %{prefix}/lib/samba/charset/*.so
 #%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
 %attr(755,root,root) %{prefix}/lib/samba/*.dat
+%attr(755,root,root) %{prefix}/lib/samba/*.msg
 %{prefix}/include/libsmbclient.h
 %{prefix}/lib/libsmbclient.a
 %{prefix}/lib/libsmbclient.so