s4:provision - Remap conflicting thumbnailPhoto and thumbnailLogo OID's.

diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0
index 4ed833fa331a2ae80c4034cd3cd88089f86a3686..34d48a09626fb47cade74eb62ddc7e604c4639c1 100644 (file)
--- a/source4/setup/schema-map-fedora-ds-1.0
+++ b/source4/setup/schema-map-fedora-ds-1.0
@@ -33,6 +33,11 @@ sambaConfigOption
 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.255.2
+#thumbnailPhoto has a conflicting OID
+2.16.840.1.113730.3.1.35:1.3.6.1.4.1.7165.4.255.10
+#thumbnailLogo has a conflicting OID
+2.16.840.1.113730.3.1.36:1.3.6.1.4.1.7165.4.255.11
+
 #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 3216f4f7c9bccaa472af49d1fb2c41aeade1d782..70ae5d8d776e86047985baa600d99936912a0953 100644 (file)
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -195,6 +195,9 @@
 #Allocated: (dynamicObject) samba4DynamicObject: 1.3.6.1.4.1.7165.4.255.8
 #Allocated: (entryTTL) samba4EntryTTL: 1.3.6.1.4.1.7165.4.255.9
 
+#Allocated: (thumbnailPhoto) attributeID: 1.3.6.1.4.1.7165.4.255.10
+#Allocated: (thumbnailLogo) attributeID: 1.3.6.1.4.1.7165.4.255.11
+
 #
 # Based on domainDNS, but without the DNS bits.
 #