From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 11 Jan 2008 04:19:27 +0000 (+1100)
Subject: Remove 'dn' from mapping, it isn't a valid attribute in AD, and causes
X-Git-Tag: samba-4.0.0alpha6~801^3~739
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=ac4810f1bb8984971a98d30c6a3b0b29367d1e2e;hp=-c;ds=sidebyside

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)
---

ac4810f1bb8984971a98d30c6a3b0b29367d1e2e
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 91001d43d7a..970106787be 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -375,15 +375,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,
@@ -533,15 +524,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,
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index b042d1d3b7b..c11eea1757c 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));