r19336: Merge from release branch: new Mapped OIDs, in own subtree.

Andrew Bartlett
(This used to be commit ac5abff4b66619c29357adb7e013700bdf686709)

diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0
index 2382aea212c3889bc19898b62b04a55e8076d843..3bbd34ecb44c49f4a6608a3882db897bc723d4ce 100644 (file)
--- 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 bb6aabd4cadcab7a181fba9252c27099d2229e34..e9880f272af28bb244d78e0e5cd5995f18cb2179 100644 (file)
--- 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 4efcfc4c12f3c8b59228d71b39a7226680a794c8..383ebb0edb5d25ca39ff497d0aa0c1a60ce3e9c5 100644 (file)
--- 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