Corrections to Microsoft's schema and the OpenLDAP mapping file

diff --git a/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt b/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt
index 743e1d0abebcf2919fb2f3030bf2029804197f55..ab4f3999bd2fe30f12949002ec603e250ef07067 100644 (file)
--- a/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt
+++ b/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt
@@ -2423,6 +2423,20 @@ searchFlags: 0
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
+cn: Global-Address-List2\r
+ldapDisplayName: globalAddressList2\r
+attributeId: 1.2.840.113556.1.4.2047\r
+attributeSyntax: 2.5.5.1\r
+linkID: 2124\r
+omSyntax: 127\r
+omObjectClass: 1.3.12.2.1011.28.0.714\r
+isSingleValued: FALSE\r
+schemaIdGuid: 4898f63d-4112-477c-8826-3ca00bd8277d\r
+systemOnly: FALSE\r
+searchFlags: 0\r
+systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
+schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
+\r
 cn: Governs-ID\r
 ldapDisplayName: governsID\r
 attributeId: 1.2.840.113556.1.2.22\r
@@ -3891,6 +3905,20 @@ searchFlags: 0
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
+cn: Address-Book-Roots2\r
+ldapDisplayName: addressBookRoots2\r
+attributeId: 1.2.840.113556.1.4.2046\r
+attributeSyntax: 2.5.5.1\r
+linkID: 2122\r
+omSyntax: 127\r
+omObjectClass: 1.3.12.2.1011.28.0.714\r
+isSingleValued: FALSE\r
+schemaIdGuid: 508ca374-a511-4e4e-9f4f-856f61a6b7e4\r
+systemOnly: FALSE\r
+searchFlags: 0\r
+systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
+schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
+\r
 cn: Address-Entry-Display-Table\r
 ldapDisplayName: addressEntryDisplayTable\r
 attributeId: 1.2.840.113556.1.2.324\r
@@ -5835,6 +5863,20 @@ rangeLower: 0
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
+cn: ms-DS-BridgeHead-Servers-Used\r
+ldapDisplayName: msDS-BridgeHeadServersUsed\r
+attributeId: 1.2.840.113556.1.4.2049\r
+attributeSyntax: 2.5.5.7\r
+omSyntax: 127\r
+omObjectClass: 1.2.840.113556.1.1.1.11\r
+linkID: 2160\r
+isSingleValued: FALSE\r
+showInAdvancedViewOnly: TRUE\r
+schemaIdGuid: 3ced1465-7b71-2541-8780-1e1ea6243a82\r
+searchFlags: 0\r
+systemFlags: FLAG_ATTR_NOT_REPLICATED | FLAG_ATTR_IS_OPERATIONAL | FLAG_SCHEMA_BASE_OBJECT\r
+schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
+\r
 cn: ms-DS-Byte-Array\r
 ldapDisplayName: msDS-ByteArray\r
 attributeId: 1.2.840.113556.1.4.1831\r
@@ -13740,6 +13782,20 @@ searchFlags: 0
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
+cn: Template-Roots2\r
+ldapDisplayName: templateRoots2\r
+attributeId: 1.2.840.113556.1.4.2048\r
+attributeSyntax: 2.5.5.1\r
+omSyntax: 127\r
+omObjectClass: 1.3.12.2.1011.28.0.714\r
+isSingleValued: FALSE\r
+linkId: 2126\r
+schemaIdGuid: b1cba91a-0682-4362-a659-153e201ef069\r
+systemOnly: FALSE\r
+searchFlags: 0\r
+systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
+schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
+\r
 cn: Terminal-Server\r
 ldapDisplayName: terminalServer\r
 attributeId: 1.2.840.113556.1.4.885\r

diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3
index bff1695c8f8d247947a768de4b9822e9b3b05bf3..233f9a961373ba53543fb1df00a570d169c99ff9 100644 (file)
--- a/source4/setup/schema-map-openldap-2.3
+++ b/source4/setup/schema-map-openldap-2.3
@@ -11,6 +11,9 @@ distinguishedName
 description
 cn
 top
+entryTTL
+uidNumber
+gidNumber
 #The memberOf plugin provides this attribute
 memberOf
 #These conflict with OpenLDAP builtins
@@ -42,3 +45,7 @@ modifyTimeStamp:samba4ModifyTimestamp
 1.3.6.1.4.1.1466.115.121.1.38:1.3.6.1.4.1.1466.115.121.1.44
 #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
+#Treat Object(DN-String) as a binary blob
+1.2.840.113556.1.4.904:1.3.6.1.4.1.1466.115.121.1.40
+#Treat UTC-Time as GeneralizedTime
+1.3.6.1.4.1.1466.115.121.1.53:1.3.6.1.4.1.1466.115.121.1.24