Merge from 3.0:

>last minute updates from Buchan
(This used to be commit e3e13cbc19d00b10d161a46a78e993232c1504c8)

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: