Add DESC to various schema elements

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 0a3b28f59d7925e775db4d7f1c471693743c6da3..4248fb4df97dd8ae4a280469fe29ecd22892c1bd 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -36,80 +36,98 @@ attributetype ( 2.5.18.2 NAME 'modifyTimestamp'
        SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
 
 attributetype ( 2.5.18.3 NAME 'creatorsName'
+       DESC 'name of creator'
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
        SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
 
 attributetype ( 2.5.18.4 NAME 'modifiersName'
+       DESC 'name of last modifier'
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
        SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
 
 attributetype ( 2.5.18.10 NAME 'subschemaSubentry'
+       DESC 'name of controlling subschema entry'
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION
        SINGLE-VALUE USAGE directoryOperation )
 
 attributetype ( 2.5.21.1 NAME 'dITStructureRules'
+       DESC 'RFC2252 DIT structure rules'
        EQUALITY integerFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 USAGE directoryOperation )
 
 attributetype ( 2.5.21.2 NAME 'dITContentRules'
+       DESC 'RFC2252 DIT content rules'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )
 
 attributetype ( 2.5.21.4 NAME 'matchingRules'
+       DESC 'RFC2252 matching rules'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.30 USAGE directoryOperation )
 
 attributetype ( 2.5.21.5 NAME 'attributeTypes'
+       DESC 'RFC2252 attribute types'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.3 USAGE directoryOperation )
 
 attributetype ( 2.5.21.6 NAME 'objectClasses'
+       DESC 'RFC2252 object classes'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.37 USAGE directoryOperation )
 
 attributetype ( 2.5.21.7 NAME 'nameForms'
+       DESC 'RFC2252 name forms '
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.35 USAGE directoryOperation )
 
 attributetype ( 2.5.21.8 NAME 'matchingRuleUse'
+       DESC 'RFC2252 matching rule uses'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation )
 
 # From X.500(97?)
 attributetype ( 2.5.21.9 NAME 'structuralObjectClass'
+       DESC 'X.500(97) structural object class'
        EQUALITY objectIdentifierMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
        NO-USER-MODIFICATION SINGLE-VALUE USAGE directoryOperation )
 
 # LDAP Operational Attributes from RFC2252
 attributetype ( 1.3.6.1.4.1.1466.101.120.5 NAME 'namingContexts'
+       DESC 'RFC2252 naming contexts'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer'
+       DESC 'RFC2252 alternative servers'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.7 NAME 'supportedExtension'
+       DESC 'RFC2252 supported extended operations'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.13 NAME 'supportedControl'
+       DESC 'RFC2252 supported controls'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.14 NAME 'supportedSASLMechanisms'
+       DESC 'RFC2252 supported SASL mechanisms'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.15 NAME 'supportedLDAPVersion'
+       DESC 'RFC2252 supported LDAP versions'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.1466.101.120.16 NAME 'ldapSyntaxes'
+       DESC 'RFC2252 LDAP syntaxes'
        EQUALITY objectIdentifierFirstComponentMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.54 USAGE directoryOperation )
 
 # Object Classes from RFC2252
 objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY
-       DESC 'RFC2252: controlling subschema' 
+       DESC 'RFC2252 controlling subschema (subentry)' 
        MAY ( dITStructureRules $ nameForms $ ditContentRules $
                objectClasses $ attributeTypes $ matchingRules $
                matchingRuleUse ) )
@@ -117,21 +135,25 @@ objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY
 # Standard attribute types used for subtyping from RFC2256
 
 attributetype ( 2.5.4.41 NAME 'name'
+       DESC 'name supertype' 
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
 attributetype ( 2.5.4.49 NAME 'distinguishedName'
+       DESC 'distingushed name supertype' 
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
 # Standard attribute types from RFC2256
 
 attributetype ( 2.5.4.0 NAME 'objectClass'
+       DESC 'object classes of the entity' 
        EQUALITY objectIdentifierMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
 
-attributetype ( 2.5.4.1 NAME 'aliasedObjectName'
+attributetype ( 2.5.4.1 NAME ( 'aliasedObjectName' 'aliasedEntryName' )
+       DESC 'name of aliased object'
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
 
@@ -140,16 +162,23 @@ attributetype ( 2.5.4.2 NAME 'knowledgeInformation'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
-attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' ) SUP name )
+attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' )
+       DESC 'common name(s) for which the entity is known by'
+       SUP name )
 
-attributetype ( 2.5.4.4 NAME ( 'sn' 'surname' ) SUP name )
+attributetype ( 2.5.4.4 NAME ( 'sn' 'surname' )
+       DESC 'last (family) name(s) for which the entity is known by'
+       SUP name )
 
-attributetype ( 2.5.4.5 NAME 'serialNumber' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.5 NAME 'serialNumber'
+       DESC 'serial number of the entity'
+       EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} )
 
-# (2-letter code from ISO 3166)
-attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' ) SUP name SINGLE-VALUE )
+attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
+       DESC 'ISO-3166 country 2-letter code'
+       SUP name SINGLE-VALUE )
 
 attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' ) SUP name )
 
@@ -164,9 +193,12 @@ attributetype ( 2.5.4.10 NAME ( 'o' 'organizationName' ) SUP name )
 
 attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' ) SUP name )
 
-attributetype ( 2.5.4.12 NAME 'title' SUP name )
+attributetype ( 2.5.4.12 NAME 'title'
+       DESC 'title associated with the entity'
+       SUP name )
 
 attributetype ( 2.5.4.13 NAME 'description'
+       DESC 'descriptive information'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
@@ -259,22 +291,27 @@ attributetype ( 2.5.4.35 NAME 'userPassword'
 
 # Must be transferred using ;binary
 attributetype ( 2.5.4.36 NAME 'userCertificate'
+       DESC 'X.509 user certificate, must be transferred using ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
 # Must be transferred using ;binary
 attributetype ( 2.5.4.37 NAME 'cACertificate'
+       DESC 'X.509 CA certificate, must be transferred using ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
 # Must be transferred using ;binary
 attributetype ( 2.5.4.38 NAME 'authorityRevocationList'
+       DESC 'X.509 authority revocation list, must be transferred using ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
 
 # Must be transferred using ;binary
 attributetype ( 2.5.4.39 NAME 'certificateRevocationList'
+       DESC 'X.509 certificate revocation list, must be transferred using ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
 
 # Must be stored and requested in the binary form
 attributetype ( 2.5.4.40 NAME 'crossCertificatePair'
+       DESC 'X.509 cross certificate pair, must be transferred using ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.10 )
 
 # 2.5.4.41 is defined above as it's used for subtyping
@@ -283,11 +320,14 @@ attributetype ( 2.5.4.40 NAME 'crossCertificatePair'
 #      SUBSTR caseIgnoreSubstringsMatch
 #      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
-attributetype ( 2.5.4.42 NAME ( 'givenName' 'gn' ) SUP name )
+attributetype ( 2.5.4.42 NAME ( 'givenName' 'gn' )
+       DESC 'first name(s) for which the entity is known by'
+       SUP name )
 
-attributetype ( 2.5.4.43 NAME 'initials' SUP name
+attributetype ( 2.5.4.43 NAME 'initials'
        DESC 'The initials attribute type contains the initials of some
-               or all of an individuals names, but not the surname(s).' )
+               or all of an individuals names, but not the surname(s).'
+       SUP name )
 
 attributetype ( 2.5.4.44 NAME 'generationQualifier' 
        DESC 'e.g. Jr or II.'
@@ -336,8 +376,9 @@ attributetype ( 2.5.4.54 NAME 'dmdName' SUP name )
 
 # Standard object classes from RFC2256
 
-objectclass ( 2.5.6.0 NAME 'top' ABSTRACT
-       MUST objectClass )
+objectclass ( 2.5.6.0 NAME 'top'
+       DESC 'superior class of all structural and most auxiliary classes'
+       ABSTRACT MUST objectClass )
 
 objectclass ( 2.5.6.1 NAME 'alias' SUP top STRUCTURAL
        MUST aliasedObjectName )