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

[Endi Sukma Dewata]

---
 source4/setup/schema-map-fedora-ds-1.0 |    5 +++++
 source4/setup/schema_samba4.ldif       |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0
index 4ed833f..34d48a0 100644
--- 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 fd663fd..ea61016 100644
--- 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.
 #
-- 
1.6.5.2


------=_Part_50994_1724393948.1260308485813--