diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-04-27 11:13:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:38 -0500 |
| commit | 4d23d4b21029c7958055cf8fac1052ad16f67752 (patch) | |
| tree | d06350cffa3c698714cab57bacb2170dd1b1e2d0 | |
| parent | e5ea03737fa3d989f4f9d0d679b959da221849c9 (diff) | |
| download | samba-4d23d4b21029c7958055cf8fac1052ad16f67752.tar.gz samba-4d23d4b21029c7958055cf8fac1052ad16f67752.tar.bz2 samba-4d23d4b21029c7958055cf8fac1052ad16f67752.zip | |
r22531: Fix up OpenLDAP schema map to almost pass 'make test'.
Andrew Bartlett
(This used to be commit ef9320ae5b0b01bd39b60c22ff4e3698ac0ae9a7)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/entryUUID.c | 20 | ||||
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 6 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c index 605614f160..397642c484 100644 --- a/source4/dsdb/samdb/ldb_modules/entryUUID.c +++ b/source4/dsdb/samdb/ldb_modules/entryUUID.c @@ -356,7 +356,25 @@ const struct ldb_map_attribute entryUUID_attributes[] = .type = MAP_RENAME, .u = { .rename = { - .remote_name = "sambaObjectClasses" + .remote_name = "samba4ObjectClasses" + } + } + }, + { + .local_name = "dITContentRules", + .type = MAP_RENAME, + .u = { + .rename = { + .remote_name = "samba4DITContentRules" + } + } + }, + { + .local_name = "attributeTypes", + .type = MAP_RENAME, + .u = { + .rename = { + .remote_name = "samba4AttributeTypes" } } }, diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index 9268b1c969..44fc3de6df 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -2,7 +2,6 @@ name labeledURI createTimeStamp -attributeTypes objectClass userPassword seeAlso @@ -12,11 +11,14 @@ structuralObjectClass distinguishedName description cn -dITContentRules top #This shouldn't make it to the ldap server sambaPassword #These conflict with OpenLDAP builtins +attributeTypes:samba4AttributeTypes +2.5.21.5:1.3.6.1.4.1.7165.4.255.7 +dITContentRules:samba4DITContentRules +2.5.21.2:1.3.6.1.4.1.7165.4.255.6 objectClasses:samba4ObjectClasses 2.5.21.6:1.3.6.1.4.1.7165.4.255.5 subSchema:samba4SubSchema diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index c0a50bd508..2967261758 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -169,3 +169,5 @@ oMSyntax: 20 #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 +#Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6 +#Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7 |