s4:provision - Removed dependency on full Samba 3 schema from FDS

[samba.git] / source4 / dsdb / samdb / ldb_modules / simple_ldap_map.c

diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 36104e7e3c175fa5dcf9ef5d32f2ecb9cda1d075..8d3c78d37fb8cea09c11f4104158081fc9b4d4f4 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -611,18 +611,9 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
                         }
                }
        },
-       {
-               .local_name = "unixHomeDirectory",
-               .type = MAP_RENAME,
-               .u = {
-                       .rename = {
-                                .remote_name = "homeDirectory"
-                        }
-               }
-       },
        {
                .local_name = "pwdLastSet",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaPwdLastSet"
@@ -631,7 +622,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "lastLogon",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaLogonTime"
@@ -640,7 +631,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "lastLogoff",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaLogoffTime"
@@ -649,7 +640,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "badPwdCount",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaBadPasswordCount"
@@ -658,7 +649,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "logonHours",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaLogonHours"
@@ -667,7 +658,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "homeDrive",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaHomeDrive"
@@ -676,7 +667,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "scriptPath",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaLogonScript"
@@ -685,7 +676,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "profilePath",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaProfilePath"
@@ -694,7 +685,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "userWorkstations",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaUserWorkstations"
@@ -703,7 +694,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "homeDirectory",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaHomePath"
@@ -712,7 +703,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "nextRid",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaNextRid"
@@ -721,7 +712,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
        },
        {
                .local_name = "privilegeDisplayName",
-               .type = MAP_RENAME,
+               .type = LDB_MAP_RENAME,
                .u = {
                        .rename = {
                                 .remote_name = "sambaPrivName"
@@ -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
        }