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

[samba.git] / source4 / setup / schema-map-fedora-ds-1.0

diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0
index 74d9e2ac5affac34383f1bb52de1a8462e2f66ef..34d48a09626fb47cade74eb62ddc7e604c4639c1 100644 (file)
--- a/source4/setup/schema-map-fedora-ds-1.0
+++ b/source4/setup/schema-map-fedora-ds-1.0
@@ -1,4 +1,4 @@
-#Standard OpenLDAP attributes
+#Standard Fedora DS attributes
 name
 objectClasses
 createTimeStamp
@@ -12,13 +12,32 @@ description
 cn
 dITContentRules
 top
+
 #This should be provided by the LDAP server, only in our schema to permit provision
 aci
+
 #Skip ObjectClasses
+sambaSamAccount
+sambaGroupMapping
+sambaTrustPassword
+sambaTrustedDomainPassword
+sambaDomain
+sambaUnixIdPool
+sambaIdmapEntry
+sambaSidEntry
+sambaConfig
+sambaShare
+sambaConfigOption
+
 #MiddleName has a conflicting OID
 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
@@ -29,3 +48,41 @@ aci
 1.3.6.1.4.1.1466.115.121.1.36:1.3.6.1.4.1.1466.115.121.1.15
 #Treat Object(DN-Binary) as a binary blob
 1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.40
+#Printable String as IA5 String
+1.3.6.1.4.1.1466.115.121.1.44:1.3.6.1.4.1.1466.115.121.1.26
+#UTC Time as Generalized Time
+1.3.6.1.4.1.1466.115.121.1.53:1.3.6.1.4.1.1466.115.121.1.24
+#DN with String as Directory String
+1.2.840.113556.1.4.904:1.3.6.1.4.1.1466.115.121.1.15
+#Presentation Address as Directory String
+1.3.6.1.4.1.1466.115.121.1.43:1.3.6.1.4.1.1466.115.121.1.15
+
+#Remap into existing schema
+pwdLastSet
+pwdLastSet:sambaPwdLastSet
+lastLogon
+lastLogon:sambaLogonTime
+lastLogoff
+lastLogoff:sambaLogoffTime
+badPwdCount
+badPwdCount:sambaBadPasswordCount
+logonHours
+logonHours:sambaLogonHours
+homeDrive
+homeDrive:sambaHomeDrive
+scriptPath
+scriptPath:sambaLogonScript
+profilePath
+profilePath:sambaProfilePath
+userWorkstations
+userWorkstations:sambaUserWorkstations
+homeDirectory
+homeDirectory:sambaHomePath
+groupType
+groupType:sambaGroupType
+nextRid
+nextRid:sambaNextRid
+privilegeDisplayName
+privilegeDisplayName:sambaPrivName
+objectSid
+objectSid:sambaSID