diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-08-18 06:14:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:16 -0500 |
| commit | 49b335c756d22d7f6acfa32a07fa291e04b49a87 (patch) | |
| tree | 8625e2581c123f9fbfe26de026e33041f61b6e90 /source4/setup | |
| parent | c35420160eca800c07bbb423c6ca5636934c676a (diff) | |
| download | samba-49b335c756d22d7f6acfa32a07fa291e04b49a87.tar.gz samba-49b335c756d22d7f6acfa32a07fa291e04b49a87.tar.bz2 samba-49b335c756d22d7f6acfa32a07fa291e04b49a87.zip | |
r17600: Finish the schema conversion tool, and add a mapping file, used to map
OIDs and skip built-in attributes.
Andrew Bartlett
(This used to be commit cb2b9d800d1228d41f7872a7b7c8ea5f07816c61)
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/provision_init.ldif | 2 | ||||
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 31 | ||||
| -rw-r--r-- | source4/setup/schema.ldif | 26 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 14 |
4 files changed, 46 insertions, 27 deletions
diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif index 7414368d44..914184a35b 100644 --- a/source4/setup/provision_init.ldif +++ b/source4/setup/provision_init.ldif @@ -10,6 +10,8 @@ dn: @INDEXLIST @IDXATTR: unixName @IDXATTR: privilege @IDXATTR: nCName +@IDXATTR: lDAPDisplayName +@IDXATTR: subClassOf dn: @ATTRIBUTES userPrincipalName: CASE_INSENSITIVE diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 new file mode 100644 index 0000000000..f270b983c5 --- /dev/null +++ b/source4/setup/schema-map-openldap-2.3 @@ -0,0 +1,31 @@ +#Standard OpenLDAP attributes +name +labeledURI +objectClasses +createTimeStamp +attributeTypes +objectClass +userPassword +seeAlso +uid +subSchemaSubEntry +structuralObjectClass +modifyTimeStamp +distinguishedName +description +cn +dITContentRules +top +#Skip ObjectClasses +subSchema +# +#MiddleName has a conflicting OID +2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8 +#This large integer format is unimplemented in OpenLDAP 2.3 +1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27 +#This case insensitive string isn't available +1.2.840.113556.1.4.905:1.3.6.1.4.1.1466.115.121.1.44 +#This type of DN isn't in OpenLDAP +1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.12 +#Treat Security Descriptors as binary +1.2.840.113556.1.4.907:1.3.6.1.4.1.1466.115.121.1.40
\ No newline at end of file diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif index f4d31a5ed0..6f8f62d080 100644 --- a/source4/setup/schema.ldif +++ b/source4/setup/schema.ldif @@ -568,19 +568,19 @@ adminDisplayName: houseIdentifier attributeID: 2.5.4.51 attributeSyntax: 2.5.5.12 -#dn: CN=middleName,CN=Schema,CN=Configuration,${BASEDN} -#cn: middleName -#name: middleName -#objectClass: top -#objectClass: attributeSchema -#lDAPDisplayName: middleName -#isSingleValued: TRUE -#systemFlags: 16 -#systemOnly: FALSE -#schemaIDGUID: bf9679f2-0de6-11d0-a285-00aa003049e2 -#adminDisplayName: Other-Name -#attributeID: 2.16.840.1.113730.3.1.34 -#attributeSyntax: 2.5.5.12 +dn: CN=middleName,CN=Schema,CN=Configuration,${BASEDN} +cn: middleName +name: middleName +objectClass: top +objectClass: attributeSchema +lDAPDisplayName: middleName +isSingleValued: TRUE +systemFlags: 16 +systemOnly: FALSE +schemaIDGUID: bf9679f2-0de6-11d0-a285-00aa003049e2 +adminDisplayName: Other-Name +attributeID: 2.16.840.1.113730.3.1.34 +attributeSyntax: 2.5.5.12 dn: CN=replTopologyStayOfExecution,CN=Schema,CN=Configuration,${BASEDN} cn: replTopologyStayOfExecution diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 94b79bd31f..61af0936dc 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -106,20 +106,6 @@ adminDisplayName: Privilege attributeID: 1.3.6.1.4.1.7165.4.1.7 attributeSyntax: 2.5.5.4 -dn: CN=middleName,CN=Schema,CN=Configuration,${BASEDN} -cn: middleName -name: middleName -objectClass: top -objectClass: attributeSchema -lDAPDisplayName: middleName -sSingleValued: TRUE -systemFlags: 16 -systemOnly: FALSE -schemaIDGUID: bf9679f2-0de6-11d0-a285-00aa003049e2 -adminDisplayName: Other-Name -attributeID: 1.3.6.1.4.1.7165.4.1.8 -attributeSyntax: 2.5.5.12 - dn: CN=unixName,CN=Schema,CN=Configuration,${BASEDN} cn: unixName name: unixName |