diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-10-16 12:29:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
| commit | e350ca0bcbc76d4298a4c24ccef9e430ba75b8a8 (patch) | |
| tree | 221a22e384c3c530cf2ab063f1a496d2574c1aba /source4 | |
| parent | 794a7f52235bbd7aa87629f47d2bf6a65835a615 (diff) | |
| download | samba-e350ca0bcbc76d4298a4c24ccef9e430ba75b8a8.tar.gz samba-e350ca0bcbc76d4298a4c24ccef9e430ba75b8a8.tar.bz2 samba-e350ca0bcbc76d4298a4c24ccef9e430ba75b8a8.zip | |
r19336: Merge from release branch: new Mapped OIDs, in own subtree.
Andrew Bartlett
(This used to be commit ac5abff4b66619c29357adb7e013700bdf686709)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 4 | ||||
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 4 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0 index 2382aea212..3bbd34ecb4 100644 --- a/source4/setup/schema-map-fedora-ds-1.0 +++ b/source4/setup/schema-map-fedora-ds-1.0 @@ -15,9 +15,9 @@ top #Skip ObjectClasses # #MiddleName has a conflicting OID -2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8 +2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID -1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.1.11 +1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.255.2 #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 diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index bb6aabd4ca..e9880f272a 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -20,9 +20,9 @@ top subSchema # #MiddleName has a conflicting OID -2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8 +2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID -1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.1.11 +1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.255.2 #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 diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 4efcfc4c12..383ebb0edb 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -4,6 +4,7 @@ ## Samba4 OID allocation from Samba3's examples/LDAP/samba.schema ## 1.3.6.1.4.1.7165.4.1.x - attributetypes ## 1.3.6.1.4.1.7165.4.2.x - objectclasses +## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track # # @@ -113,8 +114,6 @@ attributeID: 1.3.6.1.4.1.7165.4.1.7 attributeSyntax: 2.5.5.4 oMSyntax: 20 -#Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.1.7 - dn: CN=unixName,CN=Schema,CN=Configuration,${BASEDN} cn: unixName @@ -147,4 +146,6 @@ attributeSyntax: 2.5.5.10 oMSyntax: 4 -#Allocated: (defaultGroup) attributeID: 1.3.6.1.4.1.7165.4.1.11 +#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 |