summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-01-11 15:19:27 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-01-11 15:19:27 +1100
commitac4810f1bb8984971a98d30c6a3b0b29367d1e2e (patch)
tree7bb992009c4a4cf3e98bd6863b2ae808147812a4
parent6a875cc8529d971cd41d2ba53952481545989d53 (diff)
downloadsamba-ac4810f1bb8984971a98d30c6a3b0b29367d1e2e.tar.gz
samba-ac4810f1bb8984971a98d30c6a3b0b29367d1e2e.tar.bz2
samba-ac4810f1bb8984971a98d30c6a3b0b29367d1e2e.zip
Remove 'dn' from mapping, it isn't a valid attribute in AD, and causes
problems with ldap.js test with OpenLDAP as the backend. Likewise, remove it from the template lookup (for consistancy). TODO: see if it can be removed from ldb Andrew Bartlett (This used to be commit 47a1b76f7fff30229d3f23c6723f047923faf196)
-rw-r--r--source4/dsdb/samdb/ldb_modules/simple_ldap_map.c18
-rw-r--r--source4/dsdb/samdb/samdb.c2
2 files changed, 1 insertions, 19 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 91001d43d7..970106787b 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -376,15 +376,6 @@ static const struct ldb_map_attribute entryuuid_attributes[] =
}
},
{
- .local_name = "dn",
- .type = MAP_RENAME,
- .u = {
- .rename = {
- .remote_name = "entryDN"
- }
- }
- },
- {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
@@ -534,15 +525,6 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
}
},
{
- .local_name = "dn",
- .type = MAP_RENAME,
- .u = {
- .rename = {
- .remote_name = "entryDN"
- }
- }
- },
- {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index b042d1d3b7..c11eea1757 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -134,7 +134,7 @@ int samdb_copy_template(struct ldb_context *ldb,
}
/* pull the template record */
- ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE, "(dn=*)", NULL, &res);
+ ret = ldb_search(templates_ldb, basedn, LDB_SCOPE_BASE, "distinguishedName=*", NULL, &res);
talloc_free(basedn);
if (ret != LDB_SUCCESS) {
*errstring = talloc_steal(msg, ldb_errstring(templates_ldb));