diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2009-12-08 14:55:16 -0600 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-12-15 10:04:04 +1100 |
| commit | f871de7def8dcb180f34b04eff182600607c9f87 (patch) | |
| tree | 75e121013182ad9a120c1719695c98859a173e8e /source4/setup | |
| parent | 0d10efe1fdec2a621bd6580e3e120287c1682d07 (diff) | |
| download | samba-f871de7def8dcb180f34b04eff182600607c9f87.tar.gz samba-f871de7def8dcb180f34b04eff182600607c9f87.tar.bz2 samba-f871de7def8dcb180f34b04eff182600607c9f87.zip | |
s4:provision - Remap conflicting thumbnailPhoto and thumbnailLogo OID's.
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 5 | ||||
| -rw-r--r-- | 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 4ed833fa33..34d48a0962 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 3216f4f7c9..70ae5d8d77 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. # |