diff options
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 12 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index bedf402a9f..9268b1c969 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -1,7 +1,6 @@ #Standard OpenLDAP attributes name labeledURI -objectClasses createTimeStamp attributeTypes objectClass @@ -10,7 +9,6 @@ seeAlso uid subSchemaSubEntry structuralObjectClass -modifyTimeStamp distinguishedName description cn @@ -18,8 +16,14 @@ dITContentRules top #This shouldn't make it to the ldap server sambaPassword -#Skip ObjectClasses -subSchema +#These conflict with OpenLDAP builtins +objectClasses:samba4ObjectClasses +2.5.21.6:1.3.6.1.4.1.7165.4.255.5 +subSchema:samba4SubSchema +2.5.20.1:1.3.6.1.4.1.7165.4.255.4 +#Remap these so that we don't put operational attributes in a schema MAY +modifyTimeStamp:samba4ModifyTimestamp +2.5.18.2:1.3.6.1.4.1.7165.4.255.3 #MiddleName has a conflicting OID 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 150586976f..c0a50bd508 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -165,3 +165,7 @@ oMSyntax: 20 #Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.255.1 #Allocated: (defaultGroup) attributeID: 1.3.6.1.4.1.7165.4.255.2 + +#Allocated: (modifyTimestamp) samba4ModifyTimestamp: 1.3.6.1.4.1.7165.4.255.3 +#Allocated: (subSchema) samba4SubSchema: 1.3.6.1.4.1.7165.4.255.4 +#Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5 |