summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-05-14 03:32:20 +0000
committerGerald Carter <jerry@samba.org>2003-05-14 03:32:20 +0000
commit5d16254f560ba26929bc473c28b85c87317ca368 (patch)
tree5761dcb1e9e1ed5dfe610454759cb5cbd60a4388 /source3/param
parentf1840747994ecbb8d7b2b3ef7dbbf4399b7b501e (diff)
downloadsamba-5d16254f560ba26929bc473c28b85c87317ca368.tar.gz
samba-5d16254f560ba26929bc473c28b85c87317ca368.tar.bz2
samba-5d16254f560ba26929bc473c28b85c87317ca368.zip
*****LDAP schema changes*****
New objectclass named sambaSamAccount which uses attribute prefaced with the phrase 'samba' to prevent future name clashes. Change in functionality of the 'ldap filter' parameter. This always defaults to "(uid=%u)" now and is and'd with the approriate objectclass depending on whether you are using ldapsam_compat or ldapsam conversion script for migrating from sambaAccount to sambaSamAccount will come next. (This used to be commit 998586e65271daa919e47e1206c0007454cbca66)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5740ce1b70..420a15c4df 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1416,10 +1416,10 @@ static void init_globals(void)
#endif /* WITH_LDAP_SAMCONFIG */
string_set(&Globals.szLdapSuffix, "");
+ string_set(&Globals.szLdapFilter, "(uid=%u)");
string_set(&Globals.szLdapMachineSuffix, "");
string_set(&Globals.szLdapUserSuffix, "");
- string_set(&Globals.szLdapFilter, "(&(uid=%u)(objectclass=sambaAccount))");
string_set(&Globals.szLdapAdminDn, "");
Globals.ldap_ssl = LDAP_SSL_ON;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;