X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source4%2Fdsdb%2Fsamdb%2Fldb_modules%2Fsimple_ldap_map.c;h=8d3c78d37fb8cea09c11f4104158081fc9b4d4f4;hp=2ab448662aa4d0a61ff3ef5a1ccf669833f54fa5;hb=8e5f5e3f05f9d2cd6ef1553deacce88c2a8c4d2e;hpb=55d2cec6402ca9568d13190c9a2049a251d2a846

diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 2ab448662aa..8d3c78d37fb 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -611,15 +611,6 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
 			 }
 		}
 	},
-	{
-		.local_name = "unixHomeDirectory",
-		.type = LDB_MAP_RENAME,
-		.u = {
-			.rename = {
-				 .remote_name = "homeDirectory"
-			 }
-		}
-	},
 	{
 		.local_name = "pwdLastSet",
 		.type = LDB_MAP_RENAME,
@@ -740,38 +731,6 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
 /* This objectClass conflicts with builtin classes on FDS */
 const struct ldb_map_objectclass nsuniqueid_objectclasses[] =
 {
-	{
-		.local_name = "domain",
-		.remote_name = "samba4Domain"
-	},
-	{
-		.local_name = "rFC822LocalPart",
-		.remote_name = "samba4RFC822LocalPart"
-	},
-	{
-		.local_name = "mailRecipient",
-		.remote_name = "samba4MailRecipient"
-	},
-	{
-		.local_name = "nisMap",
-		.remote_name = "samba4NisMap"
-	},
-	{
-		.local_name = "person",
-		.remote_name = "samba4Person"
-	},
-	{
-		.local_name = "organizationalPerson",
-		.remote_name = "samba4OrganizationalPerson"
-	},
-	{
-		.local_name = "residentialPerson",
-		.remote_name = "samba4ResidentialPerson"
-	},
-	{
-		.local_name = "inetOrgPerson",
-		.remote_name = "samba4InetOrgPerson"
-	},
 	{
 		.local_name = NULL
 	}