diff options
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 6 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index 0d38652dae..09808b6742 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -15,6 +15,10 @@ uidNumber gidNumber #The memberOf plugin provides this attribute memberOf +#'name' is the RDN in AD, but 'name' means something else in +#OpenLDAP. We use rdnValue for the mapping, but this is provided by +#the rdnval overlay. +name #These conflict with OpenLDAP builtins attributeTypes:samba4AttributeTypes 2.5.21.5:1.3.6.1.4.1.7165.4.255.7 @@ -24,8 +28,6 @@ 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 -#'name' is the RDN in AD, but something else in OpenLDAP -name:samba4RDN #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 diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index 0077a224fb..61b216b6d6 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -86,6 +86,7 @@ ${INDEX_CONFIG} overlay syncprov syncprov-sessionlog 100 syncprov-checkpoint 100 10 +overlay rdnval ### Multimaster-Replication of cn=schema Subcontext ### @@ -106,6 +107,7 @@ ${INDEX_CONFIG} overlay syncprov syncprov-sessionlog 100 syncprov-checkpoint 100 10 +overlay rdnval ### Multimaster-Replication of cn=config Subcontext ### ${MMR_SYNCREPL_CONFIG_CONFIG} @@ -125,6 +127,7 @@ ${INDEX_CONFIG} overlay syncprov syncprov-sessionlog 100 syncprov-checkpoint 100 10 +overlay rdnval ### Multimaster-Replication of cn=user/base-dn context ### ${MMR_SYNCREPL_USER_CONFIG} |