Fix errors in MS-AD_Schema_Attributes_v20080618.txt

 - Remove spurious line breaks
 - Add missing attributeId from docs
 - Remove incorrect multiple values of systemFlags
 - Fix duplicate attributeId
 - Fix schemaIdGuid syntax

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

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 324a5bf3f9bc9404e0c0aca832f5bcfa4d136ddc..743e1d0abebcf2919fb2f3030bf2029804197f55 100644 (file)
--- a/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt
+++ b/source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt
@@ -1654,7 +1654,6 @@ searchFlags: 0
 rangeLower: 1\r
 rangeUpper: 512\r
 mapiID: 35943\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Employee-Type\r
@@ -1669,7 +1668,6 @@ searchFlags: fCOPY
 rangeLower: 1\r
 rangeUpper: 256\r
 mapiID: 35945\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Enabled\r
@@ -1756,7 +1754,6 @@ searchFlags: 0
 mapiID: 32935\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
-\r
 systemOnly: TRUE\r
 \r
 cn: Extended-Class-Info\r
@@ -2722,8 +2719,6 @@ mapiID: 14857
 isMemberOfPartialAttributeSet: TRUE\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
-systemFlags: 0\r
-\r
 cn: Address-Home\r
 ldapDisplayName: homePostalAddress\r
 attributeId: 1.2.840.113556.1.2.617\r
@@ -2737,7 +2732,6 @@ rangeLower: 1
 rangeUpper: 4096\r
 attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1\r
 mapiID: 14941\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: host\r
@@ -2978,8 +2972,6 @@ mapiID: 32959
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
-searchFlags: 0\r
-\r
 cn: IpHostNumber\r
 ldapDisplayName: ipHostNumber\r
 attributeId: 1.3.6.1.1.1.1.19\r
@@ -6280,7 +6272,7 @@ isSingleValued: TRUE
 systemOnly: FALSE\r
 searchFlags: 0\r
 rangeLower: 0\r
-schemaIdGuid:: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2\r
+schemaIdGuid: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
@@ -6294,7 +6286,7 @@ systemOnly: FALSE
 searchFlags: 0\r
 rangeLower: 0\r
 rangeUpper: 65535\r
-schemaIdGuid:: b8c8c35e-4a19-4a95-99d0-69fe4446286f\r
+schemaIdGuid: b8c8c35e-4a19-4a95-99d0-69fe4446286f\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
@@ -6307,7 +6299,7 @@ isSingleValued: TRUE
 systemOnly: FALSE\r
 searchFlags: 0\r
 rangeLower: 0\r
-schemaIdGuid:: b05bda89-76af-468a-b892-1be55558ecc8\r
+schemaIdGuid: b05bda89-76af-468a-b892-1be55558ecc8\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
@@ -6717,7 +6709,7 @@ omSyntax: 1
 isSingleValued: TRUE\r
 systemOnly: FALSE\r
 searchFlags: 0\r
-schemaIdGuid:: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c\r
+schemaIdGuid: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
@@ -7032,6 +7024,7 @@ schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
 \r
 cn: ms-DS-Resultant-PSO\r
 ldapDisplayName: msDS-ResultantPSO\r
+attributeId: 1.2.840.113556.1.4.2022\r
 attributeSyntax: 2.5.5.1\r
 omSyntax: 127\r
 isSingleValued: TRUE\r
@@ -7494,7 +7487,7 @@ attributeSyntax: 2.5.5.10
 omSyntax: 4\r
 isSingleValued: TRUE\r
 rangeUpper: 102400\r
-schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa-97186a54\r
+schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa97186a54\r
 searchFlags: fRODCFilteredAttribute | fCONFIDENTIAL | fCOPY |fPRESERVEONDELETE\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
@@ -7522,7 +7515,6 @@ systemFlags: FLAG_SCHEMA_BASE_OBJECT
 \r
 cn: ms-FVE-VolumeGuid\r
 ldapDisplayName: msFVE-VolumeGuid\r
-attributeId: 1.2.840.113556.1.4.1965\r
 attributeId: 1.2.840.113556.1.4.1998\r
 attributeSyntax: 2.5.5.10\r
 omSyntax: 4\r
@@ -8425,8 +8417,6 @@ rangeUpper: 128
 isMemberOfPartialAttributeSet: TRUE\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
 \r
-systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
-\r
 cn: MSMQ-Version\r
 ldapDisplayName: mSMQVersion\r
 attributeId: 1.2.840.113556.1.4.942\r
@@ -12196,7 +12186,6 @@ systemOnly: TRUE
 searchFlags: 0\r
 linkID: 101\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED\r
-\r
 isSingleValued: TRUE\r
 \r
 cn: Repl-Interval\r
@@ -12224,8 +12213,6 @@ isMemberOfPartialAttributeSet: TRUE
 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_IS_OPERATIONAL |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER | FLAG_ATTR_NOT_REPLICATED\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
-systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER | FLAG_ATTR_NOT_REPLICATED\r
-\r
 cn: Repl-Topology-Stay-Of-Execution\r
 ldapDisplayName: replTopologyStayOfExecution\r
 attributeId: 1.2.840.113556.1.4.677\r
@@ -12872,7 +12859,6 @@ searchFlags: 0
 rangeLower: 1\r
 rangeUpper: 64\r
 mapiID: 33072\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Next-Level-Store\r
@@ -12929,7 +12915,6 @@ searchFlags: 0
 linkID: 95\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
-\r
 isSingleValued: TRUE\r
 \r
 cn: Server-Role\r
@@ -12942,7 +12927,6 @@ schemaIdGuid: bf967a33-0de6-11d0-a285-00aa003049e2
 systemOnly: FALSE\r
 searchFlags: 0\r
 attributeSecurityGuid: b8119fd0-04f6-4762-ab7a-4986c76b3f9a\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Server-State\r
@@ -13235,7 +13219,6 @@ attributeSecurityGuid: 59ba2f42-79a2-11d0-9020-00c04fc2d3cf
 isMemberOfPartialAttributeSet: TRUE\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
-\r
 systemOnly: TRUE\r
 \r
 cn: Signature-Algorithms\r
@@ -13339,7 +13322,6 @@ isSingleValued: FALSE
 schemaIdGuid: 1be8f17c-a9ff-11d0-afe2-00c04fd930c9\r
 systemOnly: FALSE\r
 searchFlags: 0\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Surname\r
@@ -14442,7 +14424,6 @@ rangeUpper: 32768
 attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1\r
 mapiID: 14960\r
 isMemberOfPartialAttributeSet: TRUE\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: User-Workstations\r
@@ -14580,8 +14561,6 @@ isMemberOfPartialAttributeSet: TRUE
 systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_IS_OPERATIONAL |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
-systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
-\r
 cn: Version-Number\r
 ldapDisplayName: versionNumber\r
 attributeId: 1.2.840.113556.1.4.141\r
@@ -14708,8 +14687,6 @@ isMemberOfPartialAttributeSet: TRUE
 systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
 \r
-systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
-\r
 cn: Organization-Name\r
 ldapDisplayName: o\r
 attributeId: 2.5.4.10\r
@@ -14892,7 +14869,6 @@ mapiID: 32807
 isMemberOfPartialAttributeSet: TRUE\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER\r
 schemaFlagsEx: FLAG_ATTR_IS_CRITICAL\r
-\r
 systemOnly: FALSE\r
 \r
 cn: Object-Version\r
@@ -14971,7 +14947,6 @@ isSingleValued: TRUE
 schemaIdGuid: 07383076-91df-11d1-aebc-0000f80367c1\r
 systemOnly: FALSE\r
 searchFlags: 0\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: OMT-Indx-Guid\r
@@ -15099,7 +15074,6 @@ isSingleValued: TRUE
 schemaIdGuid: 0738307b-91df-11d1-aebc-0000f80367c1\r
 systemOnly: FALSE\r
 searchFlags: 0\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: organizationalStatus\r
@@ -15244,7 +15218,6 @@ isSingleValued: TRUE
 schemaIdGuid: 0738307a-91df-11d1-aebc-0000f80367c1\r
 systemOnly: FALSE\r
 searchFlags: 0\r
-\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
 cn: Phone-Office-Other\r

diff --git a/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt b/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt
index cd784edfc3fc2d0cfb5de655794f65f7eec0efe3..e2655d57daa3bee6b09d9eafe08e1474e86621b1 100644 (file)
--- a/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt
+++ b/source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt
@@ -277,20 +277,20 @@ subClassOf: top
 systemMustContain: msDS-MaximumPasswordAge, msDS-MinimumPasswordAge,msDS-MinimumPasswordLength, msDS-PasswordComplexityEnabled,msDS-LockoutObservationWindow, msDS-LockoutDuration,msDS-LockoutThreshold, msDS-PasswordReversibleEncryptionEnabled,msDS-PasswordSettingsPrecedence, msDS-PasswordHistoryLength\r
 systemMayContain: msDS-PSOAppliesTo\r
 systemPossSuperiors: msDS-PasswordSettingsContainer\r
-schemaIdGuid:: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6\r
+schemaIdGuid: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6\r
 defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)\r
 systemOnly: FALSE\r
 defaultObjectCategory: CN=ms-DS-Password-Settings,CN=Schema,CN=Configuration,<RootDomainDN>\r
 systemFlags: FLAG_SCHEMA_BASE_OBJECT\r
 \r
-cn: ms-DS-Password-Settings\r
+cn: ms-DS-Password-Settings-Container\r
 ldapDisplayName: msDS-PasswordSettingsContainer\r
 governsId: 1.2.840.113556.1.5.256\r
 objectClassCategory: 1\r
 rdnAttId: cn\r
 subClassOf: top\r
 systemPossSuperiors: Container\r
-schemaIdGuid:: 5b06b06a-4cf3-44c0-bd16-43bc10a987da\r
+schemaIdGuid: 5b06b06a-4cf3-44c0-bd16-43bc10a987da\r
 defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)\r
 systemOnly: FALSE\r
 defaultObjectCategory: CN=ms-DS-Password-Settings-Container,CN=Schema,CN=Configuration,<RootDomainDN>\r