diff options
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samba3sam.c | 168 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 66 |
2 files changed, 117 insertions, 117 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c index f5ddff95ed..61013d133e 100644 --- a/source4/dsdb/samdb/ldb_modules/samba3sam.c +++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c @@ -308,7 +308,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaNextRid -> nextRid */ { .local_name = "nextRid", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaNextRid", @@ -319,7 +319,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaBadPasswordTime -> badPasswordtime*/ { .local_name = "badPasswordTime", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaBadPasswordTime", @@ -330,7 +330,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaLMPassword -> lmPwdHash*/ { .local_name = "dBCSPwd", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "sambaLMPassword", @@ -343,7 +343,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaGroupType -> groupType */ { .local_name = "groupType", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaGroupType", @@ -354,7 +354,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaNTPassword -> ntPwdHash*/ { .local_name = "ntpwdhash", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "sambaNTPassword", @@ -367,7 +367,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaPrimaryGroupSID -> primaryGroupID */ { .local_name = "primaryGroupID", - .type = MAP_GENERATE, + .type = LDB_MAP_GENERATE, .u = { .generate = { .remote_names = { "sambaPrimaryGroupSID", NULL }, @@ -380,7 +380,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaBadPasswordCount -> badPwdCount */ { .local_name = "badPwdCount", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaBadPasswordCount", @@ -391,7 +391,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaLogonTime -> lastLogon*/ { .local_name = "lastLogon", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaLogonTime", @@ -402,7 +402,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaLogoffTime -> lastLogoff*/ { .local_name = "lastLogoff", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaLogoffTime", @@ -413,7 +413,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* uid -> unixName */ { .local_name = "unixName", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "uid", @@ -424,7 +424,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* displayName -> name */ { .local_name = "name", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "displayName", @@ -435,13 +435,13 @@ const struct ldb_map_attribute samba3_attributes[] = /* cn */ { .local_name = "cn", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, /* sAMAccountName -> cn */ { .local_name = "sAMAccountName", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "uid", @@ -453,117 +453,117 @@ const struct ldb_map_attribute samba3_attributes[] = /* objectCategory */ { .local_name = "objectCategory", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* objectGUID */ { .local_name = "objectGUID", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* objectVersion */ { .local_name = "objectVersion", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* codePage */ { .local_name = "codePage", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* dNSHostName */ { .local_name = "dNSHostName", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* dnsDomain */ { .local_name = "dnsDomain", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* dnsRoot */ { .local_name = "dnsRoot", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* countryCode */ { .local_name = "countryCode", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* nTMixedDomain */ { .local_name = "nTMixedDomain", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* operatingSystem */ { .local_name = "operatingSystem", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* operatingSystemVersion */ { .local_name = "operatingSystemVersion", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* servicePrincipalName */ { .local_name = "servicePrincipalName", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* msDS-Behavior-Version */ { .local_name = "msDS-Behavior-Version", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* msDS-KeyVersionNumber */ { .local_name = "msDS-KeyVersionNumber", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* msDs-masteredBy */ { .local_name = "msDs-masteredBy", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* ou */ { .local_name = "ou", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, /* dc */ { .local_name = "dc", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, /* description */ { .local_name = "description", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, /* sambaSID -> objectSid*/ { .local_name = "objectSid", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "sambaSID", @@ -576,7 +576,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* sambaPwdLastSet -> pwdLastSet */ { .local_name = "pwdLastSet", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "sambaPwdLastSet", @@ -587,295 +587,295 @@ const struct ldb_map_attribute samba3_attributes[] = /* accountExpires */ { .local_name = "accountExpires", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* adminCount */ { .local_name = "adminCount", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* canonicalName */ { .local_name = "canonicalName", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* createTimestamp */ { .local_name = "createTimestamp", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* creationTime */ { .local_name = "creationTime", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* dMDLocation */ { .local_name = "dMDLocation", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* fSMORoleOwner */ { .local_name = "fSMORoleOwner", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* forceLogoff */ { .local_name = "forceLogoff", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* instanceType */ { .local_name = "instanceType", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* invocationId */ { .local_name = "invocationId", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* isCriticalSystemObject */ { .local_name = "isCriticalSystemObject", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* localPolicyFlags */ { .local_name = "localPolicyFlags", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* lockOutObservationWindow */ { .local_name = "lockOutObservationWindow", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* lockoutDuration */ { .local_name = "lockoutDuration", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* lockoutThreshold */ { .local_name = "lockoutThreshold", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* logonCount */ { .local_name = "logonCount", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* masteredBy */ { .local_name = "masteredBy", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* maxPwdAge */ { .local_name = "maxPwdAge", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* member */ { .local_name = "member", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* memberOf */ { .local_name = "memberOf", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* minPwdAge */ { .local_name = "minPwdAge", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* minPwdLength */ { .local_name = "minPwdLength", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* modifiedCount */ { .local_name = "modifiedCount", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* modifiedCountAtLastProm */ { .local_name = "modifiedCountAtLastProm", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* modifyTimestamp */ { .local_name = "modifyTimestamp", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* nCName */ { .local_name = "nCName", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* nETBIOSName */ { .local_name = "nETBIOSName", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* oEMInformation */ { .local_name = "oEMInformation", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* privilege */ { .local_name = "privilege", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* pwdHistoryLength */ { .local_name = "pwdHistoryLength", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* pwdProperties */ { .local_name = "pwdProperties", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* rIDAvailablePool */ { .local_name = "rIDAvailablePool", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* revision */ { .local_name = "revision", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* ridManagerReference */ { .local_name = "ridManagerReference", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* sAMAccountType */ { .local_name = "sAMAccountType", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* sPNMappings */ { .local_name = "sPNMappings", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* serverReference */ { .local_name = "serverReference", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* serverState */ { .local_name = "serverState", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* showInAdvancedViewOnly */ { .local_name = "showInAdvancedViewOnly", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* subRefs */ { .local_name = "subRefs", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* systemFlags */ { .local_name = "systemFlags", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* uASCompat */ { .local_name = "uASCompat", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* uSNChanged */ { .local_name = "uSNChanged", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* uSNCreated */ { .local_name = "uSNCreated", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* userPassword */ { .local_name = "userPassword", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* userAccountControl */ { .local_name = "userAccountControl", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* whenChanged */ { .local_name = "whenChanged", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* whenCreated */ { .local_name = "whenCreated", - .type = MAP_IGNORE, + .type = LDB_MAP_IGNORE, }, /* uidNumber */ { .local_name = "unixName", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "uidNumber", @@ -888,7 +888,7 @@ const struct ldb_map_attribute samba3_attributes[] = * groups and accounts? */ { .local_name = "unixName", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "gidNumber", @@ -900,7 +900,7 @@ const struct ldb_map_attribute samba3_attributes[] = /* homeDirectory */ { .local_name = "unixName", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "homeDirectory", diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c index 248d286ba6..de88178e39 100644 --- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c +++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c @@ -233,7 +233,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = /* objectGUID */ { .local_name = "objectGUID", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "entryUUID", @@ -245,7 +245,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = /* invocationId */ { .local_name = "invocationId", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "invocationId", @@ -257,7 +257,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = /* objectSid */ { .local_name = "objectSid", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "objectSid", @@ -268,7 +268,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "name", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "samba4RDN" @@ -277,7 +277,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "whenCreated", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "createTimestamp" @@ -286,7 +286,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "whenChanged", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "modifyTimestamp" @@ -295,7 +295,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "objectClasses", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "samba4ObjectClasses" @@ -304,7 +304,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "dITContentRules", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "samba4DITContentRules" @@ -313,7 +313,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "attributeTypes", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "samba4AttributeTypes" @@ -322,7 +322,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "objectCategory", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "objectCategory", @@ -333,7 +333,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "distinguishedName", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "entryDN" @@ -342,7 +342,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "primaryGroupID", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "primaryGroupID", @@ -353,7 +353,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "groupType", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "groupType", @@ -364,7 +364,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "userAccountControl", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "userAccountControl", @@ -375,7 +375,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "sAMAccountType", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "sAMAccountType", @@ -386,7 +386,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "systemFlags", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "systemFlags", @@ -397,7 +397,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "usnChanged", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "entryCSN", @@ -408,7 +408,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "usnCreated", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "createTimestamp", @@ -419,7 +419,7 @@ static const struct ldb_map_attribute entryuuid_attributes[] = }, { .local_name = "*", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, { .local_name = NULL, @@ -455,7 +455,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = /* objectGUID */ { .local_name = "objectGUID", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "nsuniqueid", @@ -467,7 +467,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = /* objectSid */ { .local_name = "objectSid", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "objectSid", @@ -478,7 +478,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "whenCreated", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "createTimestamp" @@ -487,7 +487,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "whenChanged", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "modifyTimestamp" @@ -496,7 +496,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "objectCategory", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "objectCategory", @@ -507,7 +507,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "distinguishedName", - .type = MAP_RENAME, + .type = LDB_MAP_RENAME, .u = { .rename = { .remote_name = "entryDN" @@ -516,7 +516,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "primaryGroupID", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "primaryGroupID", @@ -527,7 +527,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "groupType", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "groupType", @@ -538,7 +538,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "userAccountControl", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "userAccountControl", @@ -549,7 +549,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "sAMAccountType", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "sAMAccountType", @@ -560,7 +560,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "systemFlags", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "systemFlags", @@ -571,7 +571,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "usnChanged", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "modifyTimestamp", @@ -582,7 +582,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "usnCreated", - .type = MAP_CONVERT, + .type = LDB_MAP_CONVERT, .u = { .convert = { .remote_name = "createTimestamp", @@ -593,7 +593,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] = }, { .local_name = "*", - .type = MAP_KEEP, + .type = LDB_MAP_KEEP, }, { .local_name = NULL, |