summaryrefslogtreecommitdiff
path: root/source4/setup/ad-schema
diff options
context:
space:
mode:
authorSreepathi Pai <sree314@gmail.com>2008-12-19 10:35:52 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-12-19 10:56:09 +1100
commit43f232fcc9b3243781fa3c729f046a737be16720 (patch)
tree5af585221d5fb67e0c838597bddb6e11b19609f9 /source4/setup/ad-schema
parenta937a68826919ee1ed70e90c9173f07761f2f990 (diff)
downloadsamba-43f232fcc9b3243781fa3c729f046a737be16720.tar.gz
samba-43f232fcc9b3243781fa3c729f046a737be16720.tar.bz2
samba-43f232fcc9b3243781fa3c729f046a737be16720.zip
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>
Diffstat (limited to 'source4/setup/ad-schema')
-rw-r--r--source4/setup/ad-schema/MS-AD_Schema_Attributes_v20080618.txt39
-rw-r--r--source4/setup/ad-schema/MS-AD_Schema_Classes_v20080618.txt6
2 files changed, 9 insertions, 36 deletions
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 324a5bf3f9..743e1d0abe 100644
--- 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
rangeUpper: 512
mapiID: 35943
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Employee-Type
@@ -1669,7 +1668,6 @@ searchFlags: fCOPY
rangeLower: 1
rangeUpper: 256
mapiID: 35945
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Enabled
@@ -1756,7 +1754,6 @@ searchFlags: 0
mapiID: 32935
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-
systemOnly: TRUE
cn: Extended-Class-Info
@@ -2722,8 +2719,6 @@ mapiID: 14857
isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT
-systemFlags: 0
-
cn: Address-Home
ldapDisplayName: homePostalAddress
attributeId: 1.2.840.113556.1.2.617
@@ -2737,7 +2732,6 @@ rangeLower: 1
rangeUpper: 4096
attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1
mapiID: 14941
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: host
@@ -2978,8 +2972,6 @@ mapiID: 32959
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-searchFlags: 0
-
cn: IpHostNumber
ldapDisplayName: ipHostNumber
attributeId: 1.3.6.1.1.1.1.19
@@ -6280,7 +6272,7 @@ isSingleValued: TRUE
systemOnly: FALSE
searchFlags: 0
rangeLower: 0
-schemaIdGuid:: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2
+schemaIdGuid: 421f889a-472e-4fe4-8eb9-e1d0bc6071b2
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
@@ -6294,7 +6286,7 @@ systemOnly: FALSE
searchFlags: 0
rangeLower: 0
rangeUpper: 65535
-schemaIdGuid:: b8c8c35e-4a19-4a95-99d0-69fe4446286f
+schemaIdGuid: b8c8c35e-4a19-4a95-99d0-69fe4446286f
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
@@ -6307,7 +6299,7 @@ isSingleValued: TRUE
systemOnly: FALSE
searchFlags: 0
rangeLower: 0
-schemaIdGuid:: b05bda89-76af-468a-b892-1be55558ecc8
+schemaIdGuid: b05bda89-76af-468a-b892-1be55558ecc8
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
@@ -6717,7 +6709,7 @@ omSyntax: 1
isSingleValued: TRUE
systemOnly: FALSE
searchFlags: 0
-schemaIdGuid:: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c
+schemaIdGuid: 75ccdd8f-af6c-4487-bb4b-69e4d38a959c
systemFlags: FLAG_SCHEMA_BASE_OBJECT
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
@@ -7032,6 +7024,7 @@ schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
cn: ms-DS-Resultant-PSO
ldapDisplayName: msDS-ResultantPSO
+attributeId: 1.2.840.113556.1.4.2022
attributeSyntax: 2.5.5.1
omSyntax: 127
isSingleValued: TRUE
@@ -7494,7 +7487,7 @@ attributeSyntax: 2.5.5.10
omSyntax: 4
isSingleValued: TRUE
rangeUpper: 102400
-schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa-97186a54
+schemaIdGuid: 1fd55ea8-88a7-47dc-8129-0daa97186a54
searchFlags: fRODCFilteredAttribute | fCONFIDENTIAL | fCOPY |fPRESERVEONDELETE
systemFlags: FLAG_SCHEMA_BASE_OBJECT
@@ -7522,7 +7515,6 @@ systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: ms-FVE-VolumeGuid
ldapDisplayName: msFVE-VolumeGuid
-attributeId: 1.2.840.113556.1.4.1965
attributeId: 1.2.840.113556.1.4.1998
attributeSyntax: 2.5.5.10
omSyntax: 4
@@ -8425,8 +8417,6 @@ rangeUpper: 128
isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
-systemFlags: FLAG_SCHEMA_BASE_OBJECT
-
cn: MSMQ-Version
ldapDisplayName: mSMQVersion
attributeId: 1.2.840.113556.1.4.942
@@ -12196,7 +12186,6 @@ systemOnly: TRUE
searchFlags: 0
linkID: 101
systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED
-
isSingleValued: TRUE
cn: Repl-Interval
@@ -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
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER | FLAG_ATTR_NOT_REPLICATED
-
cn: Repl-Topology-Stay-Of-Execution
ldapDisplayName: replTopologyStayOfExecution
attributeId: 1.2.840.113556.1.4.677
@@ -12872,7 +12859,6 @@ searchFlags: 0
rangeLower: 1
rangeUpper: 64
mapiID: 33072
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Next-Level-Store
@@ -12929,7 +12915,6 @@ searchFlags: 0
linkID: 95
systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_NOT_REPLICATED
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-
isSingleValued: TRUE
cn: Server-Role
@@ -12942,7 +12927,6 @@ schemaIdGuid: bf967a33-0de6-11d0-a285-00aa003049e2
systemOnly: FALSE
searchFlags: 0
attributeSecurityGuid: b8119fd0-04f6-4762-ab7a-4986c76b3f9a
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Server-State
@@ -13235,7 +13219,6 @@ attributeSecurityGuid: 59ba2f42-79a2-11d0-9020-00c04fc2d3cf
isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-
systemOnly: TRUE
cn: Signature-Algorithms
@@ -13339,7 +13322,6 @@ isSingleValued: FALSE
schemaIdGuid: 1be8f17c-a9ff-11d0-afe2-00c04fd930c9
systemOnly: FALSE
searchFlags: 0
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Surname
@@ -14442,7 +14424,6 @@ rangeUpper: 32768
attributeSecurityGuid: 77b5b886-944a-11d1-aebd-0000f80367c1
mapiID: 14960
isMemberOfPartialAttributeSet: TRUE
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: User-Workstations
@@ -14580,8 +14561,6 @@ isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT | FLAG_ATTR_IS_OPERATIONAL |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
-
cn: Version-Number
ldapDisplayName: versionNumber
attributeId: 1.2.840.113556.1.4.141
@@ -14708,8 +14687,6 @@ isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-systemFlags: FLAG_SCHEMA_BASE_OBJECT
-
cn: Organization-Name
ldapDisplayName: o
attributeId: 2.5.4.10
@@ -14892,7 +14869,6 @@ mapiID: 32807
isMemberOfPartialAttributeSet: TRUE
systemFlags: FLAG_SCHEMA_BASE_OBJECT |FLAG_ATTR_REQ_PARTIAL_SET_MEMBER
schemaFlagsEx: FLAG_ATTR_IS_CRITICAL
-
systemOnly: FALSE
cn: Object-Version
@@ -14971,7 +14947,6 @@ isSingleValued: TRUE
schemaIdGuid: 07383076-91df-11d1-aebc-0000f80367c1
systemOnly: FALSE
searchFlags: 0
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: OMT-Indx-Guid
@@ -15099,7 +15074,6 @@ isSingleValued: TRUE
schemaIdGuid: 0738307b-91df-11d1-aebc-0000f80367c1
systemOnly: FALSE
searchFlags: 0
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: organizationalStatus
@@ -15244,7 +15218,6 @@ isSingleValued: TRUE
schemaIdGuid: 0738307a-91df-11d1-aebc-0000f80367c1
systemOnly: FALSE
searchFlags: 0
-
systemFlags: FLAG_SCHEMA_BASE_OBJECT
cn: Phone-Office-Other
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 cd784edfc3..e2655d57da 100644
--- 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
systemMayContain: msDS-PSOAppliesTo
systemPossSuperiors: msDS-PasswordSettingsContainer
-schemaIdGuid:: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6
+schemaIdGuid: 3bcd9db8-f84b-451c-952f-6c52b81f9ec6
defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)
systemOnly: FALSE
defaultObjectCategory: CN=ms-DS-Password-Settings,CN=Schema,CN=Configuration,<RootDomainDN>
systemFlags: FLAG_SCHEMA_BASE_OBJECT
-cn: ms-DS-Password-Settings
+cn: ms-DS-Password-Settings-Container
ldapDisplayName: msDS-PasswordSettingsContainer
governsId: 1.2.840.113556.1.5.256
objectClassCategory: 1
rdnAttId: cn
subClassOf: top
systemPossSuperiors: Container
-schemaIdGuid:: 5b06b06a-4cf3-44c0-bd16-43bc10a987da
+schemaIdGuid: 5b06b06a-4cf3-44c0-bd16-43bc10a987da
defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)
systemOnly: FALSE
defaultObjectCategory: CN=ms-DS-Password-Settings-Container,CN=Schema,CN=Configuration,<RootDomainDN>