From: Kurt Zeilenga Date: Sun, 2 Dec 2001 04:50:03 +0000 (+0000) Subject: Add more DESC fields and misc cleanup X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~804 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b81fd139999d58e3ee11df807bd08b09cad35c26;p=openldap Add more DESC fields and misc cleanup --- diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index 25bec27fb2..d00e4d514b 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -3,17 +3,17 @@ # OpenLDAP Core schema # # Includes LDAPv3 schema items from: -# RFC2251-RFC2256 (LDAPv3) +# RFC 2251-RFC2256 (LDAPv3) # # select standard track schema items: -# RFC2587 (PKI) -# RFC2079 (URI) -# RFC1274 (uid/dc) -# RFC2247 (dc/dcObject) -# RFC2289 (Dynamic Directory Services) +# RFC 2587 (PKI) +# RFC 2079 (URI) +# RFC 1274 (uid/dc) +# RFC 2247 (dc/dcObject) +# RFC 2289 (Dynamic Directory Services) # # select informational schema items: -# RFC2377 (uidObject) +# RFC 2377 (uidObject) # # select IETF ''work in progress'' LDAPext/LDUP items # ldapSubentry @@ -21,7 +21,9 @@ # named referrals # alias draft -# Standard X.501(93) Operational Attribute Types from RFC2252 +# +# Standard X.501(93) Operational Attribute Types from RFC 2252 +# attributetype ( 2.5.18.1 NAME 'createTimestamp' DESC 'RFC2252: time which object was created' @@ -97,7 +99,10 @@ attributetype ( 2.5.21.9 NAME 'structuralObjectClass' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 NO-USER-MODIFICATION SINGLE-VALUE USAGE directoryOperation ) -# LDAP Operational Attributes from RFC2252 +# +# LDAP Operational Attributes from RFC 2252 +# + 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 ) @@ -127,14 +132,9 @@ attributetype ( 1.3.6.1.4.1.1466.101.120.16 NAME 'ldapSyntaxes' 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 (subentry)' - MAY ( dITStructureRules $ nameForms $ ditContentRules $ - objectClasses $ attributeTypes $ matchingRules $ - matchingRuleUse ) ) - -# Standard attribute types used for subtyping from RFC2256 +# +# Standard attribute types used for subtyping from RFC 2256 +# attributetype ( 2.5.4.41 NAME 'name' DESC 'RFC2256: common supertype of name attributes' @@ -147,7 +147,9 @@ attributetype ( 2.5.4.49 NAME 'distinguishedName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -# Standard attribute types from RFC2256 +# +# Standard attribute types from RFC 2256 +# attributetype ( 2.5.4.0 NAME 'objectClass' DESC 'RFC2256: object classes of the entity' @@ -159,10 +161,10 @@ attributetype ( 2.5.4.1 NAME ( 'aliasedObjectName' 'aliasedEntryName' ) EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) -attributetype ( 2.5.4.2 NAME 'knowledgeInformation' OBSOLETE - DESC 'use ref instead' +attributetype ( 2.5.4.2 NAME 'knowledgeInformation' + DESC 'RFC2256: knowledge information' EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768}) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} ) attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' ) DESC 'RFC2256: common name(s) for which the entity is known by' @@ -216,86 +218,111 @@ attributetype ( 2.5.4.13 NAME 'description' # Obsoleted by enhancedSearchGuide attributetype ( 2.5.4.14 NAME 'searchGuide' - DESC 'RFC2256: search guide - obsoleted by enhancedSearchGuide' + DESC 'RFC2256: search guide, obsoleted by enhancedSearchGuide' SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 ) attributetype ( 2.5.4.15 NAME 'businessCategory' + DESC 'RFC2256: business category' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) attributetype ( 2.5.4.16 NAME 'postalAddress' + DESC 'RFC2256: postal address' EQUALITY caseIgnoreListMatch SUBSTR caseIgnoreListSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) attributetype ( 2.5.4.17 NAME 'postalCode' + DESC 'RFC2256: postal code' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) attributetype ( 2.5.4.18 NAME 'postOfficeBox' + DESC 'RFC2256: Post Office Box' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) attributetype ( 2.5.4.19 NAME 'physicalDeliveryOfficeName' + DESC 'RFC2256: Physical Delivery Office Name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) attributetype ( 2.5.4.20 NAME 'telephoneNumber' + DESC 'RFC2256: Telephone Number' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} ) attributetype ( 2.5.4.21 NAME 'telexNumber' + DESC 'RFC2256: Telex Number' SYNTAX 1.3.6.1.4.1.1466.115.121.1.52 ) attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier' + DESC 'RFC2256: Teletex Terminal Identifier' SYNTAX 1.3.6.1.4.1.1466.115.121.1.51 ) attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) + DESC 'RFC2256: Facsimile (Fax) Telephone Number' SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 ) attributetype ( 2.5.4.24 NAME 'x121Address' + DESC 'RFC2256: X.121 Address' EQUALITY numericStringMatch SUBSTR numericStringSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} ) attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber' + DESC 'RFC2256: international ISDN number' EQUALITY numericStringMatch SUBSTR numericStringSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} ) -attributetype ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress +attributetype ( 2.5.4.26 NAME 'registeredAddress' + DESC 'RFC2256: registered postal address' + SUP postalAddress SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) attributetype ( 2.5.4.27 NAME 'destinationIndicator' + DESC 'RFC2256: destination indicator' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} ) attributetype ( 2.5.4.28 NAME 'preferredDeliveryMethod' + DESC 'RFC2256: preferred delivery method' SYNTAX 1.3.6.1.4.1.1466.115.121.1.14 SINGLE-VALUE ) attributetype ( 2.5.4.29 NAME 'presentationAddress' + DESC 'RFC2256: presentation address' EQUALITY presentationAddressMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 SINGLE-VALUE ) attributetype ( 2.5.4.30 NAME 'supportedApplicationContext' + DESC 'RFC2256: supported application context' EQUALITY objectIdentifierMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 ) -attributetype ( 2.5.4.31 NAME 'member' SUP distinguishedName ) +attributetype ( 2.5.4.31 NAME 'member' + DESC 'RFC2256: member of a group' + SUP distinguishedName ) -attributetype ( 2.5.4.32 NAME 'owner' SUP distinguishedName ) +attributetype ( 2.5.4.32 NAME 'owner' + DESC 'RFC2256: owner (of the object)' + SUP distinguishedName ) -attributetype ( 2.5.4.33 NAME 'roleOccupant' SUP distinguishedName ) +attributetype ( 2.5.4.33 NAME 'roleOccupant' + DESC 'RFC2256: occupant of role' + SUP distinguishedName ) -attributetype ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName ) +attributetype ( 2.5.4.34 NAME 'seeAlso' + DESC 'RFC2256: DN of related object' + SUP distinguishedName ) attributetype ( 2.5.4.35 NAME 'userPassword' DESC 'RFC2256/2307: password of user' @@ -346,19 +373,23 @@ attributetype ( 2.5.4.44 NAME 'generationQualifier' SUP name ) attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier' + DESC 'RFC2256: X.500 unique identifier' EQUALITY bitStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 ) attributetype ( 2.5.4.46 NAME 'dnQualifier' + DESC 'RFC2256: DN qualifier' EQUALITY caseIgnoreMatch ORDERING caseIgnoreOrderingMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 ) attributetype ( 2.5.4.47 NAME 'enhancedSearchGuide' + DESC 'RFC2256: enhanced search guide' SYNTAX 1.3.6.1.4.1.1466.115.121.1.21 ) attributetype ( 2.5.4.48 NAME 'protocolInformation' + DESC 'RFC2256: protocol information' EQUALITY protocolInformationMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 ) @@ -368,41 +399,56 @@ attributetype ( 2.5.4.48 NAME 'protocolInformation' # SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) attributetype ( 2.5.4.50 NAME 'uniqueMember' + DESC 'RFC2256: unique member of a group' EQUALITY uniqueMemberMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 ) attributetype ( 2.5.4.51 NAME 'houseIdentifier' + DESC 'RFC2256: house identifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} ) # Must be transferred using ;binary attributetype ( 2.5.4.52 NAME 'supportedAlgorithms' + DESC 'RFC2256: supported algorithms' SYNTAX 1.3.6.1.4.1.1466.115.121.1.49 ) # Must be transferred using ;binary attributetype ( 2.5.4.53 NAME 'deltaRevocationList' + DESC 'RFC2256: delta revocation list; use ;binary' SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 ) -attributetype ( 2.5.4.54 NAME 'dmdName' SUP name ) +attributetype ( 2.5.4.54 NAME 'dmdName' + DESC 'RFC2256: name of DMD' + SUP name ) + # Standard object classes from RFC2256 objectclass ( 2.5.6.0 NAME 'top' - DESC 'superior class of all structural and most auxiliary classes' + DESC 'RFC2256: most superior class in superclass chain of all objects' ABSTRACT MUST objectClass ) -objectclass ( 2.5.6.1 NAME 'alias' SUP top STRUCTURAL +objectclass ( 2.5.6.1 NAME 'alias' + DESC 'RFC2256: an alias' + SUP top STRUCTURAL MUST aliasedObjectName ) -objectclass ( 2.5.6.2 NAME 'country' SUP top STRUCTURAL +objectclass ( 2.5.6.2 NAME 'country' + DESC 'RFC2256: a country' + SUP top STRUCTURAL MUST c MAY ( searchGuide $ description ) ) -objectclass ( 2.5.6.3 NAME 'locality' SUP top STRUCTURAL +objectclass ( 2.5.6.3 NAME 'locality' + DESC 'RFC2256: a locality' + SUP top STRUCTURAL MAY ( street $ seeAlso $ searchGuide $ st $ l $ description ) ) -objectclass ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL +objectclass ( 2.5.6.4 NAME 'organization' + DESC 'RFC2256: an organization' + SUP top STRUCTURAL MUST o MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $ x121Address $ registeredAddress $ destinationIndicator $ @@ -411,7 +457,9 @@ objectclass ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) ) -objectclass ( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL +objectclass ( 2.5.6.5 NAME 'organizationalUnit' + DESC 'RFC2256: an organizational unit' + SUP top STRUCTURAL MUST ou MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $ x121Address $ registeredAddress $ destinationIndicator $ @@ -420,18 +468,24 @@ objectclass ( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) ) -objectclass ( 2.5.6.6 NAME 'person' SUP top STRUCTURAL +objectclass ( 2.5.6.6 NAME 'person' + DESC 'RFC2256: a person' + SUP top STRUCTURAL MUST ( sn $ cn ) MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) ) -objectclass ( 2.5.6.7 NAME 'organizationalPerson' SUP person STRUCTURAL +objectclass ( 2.5.6.7 NAME 'organizationalPerson' + DESC 'RFC2256: an organizational person' + SUP person STRUCTURAL MAY ( title $ x121Address $ registeredAddress $ destinationIndicator $ preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $ telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) ) -objectclass ( 2.5.6.8 NAME 'organizationalRole' SUP top STRUCTURAL +objectclass ( 2.5.6.8 NAME 'organizationalRole' + DESC 'RFC2256: an organizational role' + SUP top STRUCTURAL MUST cn MAY ( x121Address $ registeredAddress $ destinationIndicator $ preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $ @@ -440,11 +494,15 @@ objectclass ( 2.5.6.8 NAME 'organizationalRole' SUP top STRUCTURAL postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l $ description ) ) -objectclass ( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL +objectclass ( 2.5.6.9 NAME 'groupOfNames' + DESC 'RFC2256: a group of names (DNs)' + SUP top STRUCTURAL MUST ( member $ cn ) MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) ) -objectclass ( 2.5.6.10 NAME 'residentialPerson' SUP person STRUCTURAL +objectclass ( 2.5.6.10 NAME 'residentialPerson' + DESC 'RFC2256: an residential person' + SUP person STRUCTURAL MUST l MAY ( businessCategory $ x121Address $ registeredAddress $ destinationIndicator $ preferredDeliveryMethod $ telexNumber $ @@ -453,41 +511,58 @@ objectclass ( 2.5.6.10 NAME 'residentialPerson' SUP person STRUCTURAL postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ st $ l ) ) -objectclass ( 2.5.6.11 NAME 'applicationProcess' SUP top STRUCTURAL +objectclass ( 2.5.6.11 NAME 'applicationProcess' + DESC 'RFC2256: an application process' + SUP top STRUCTURAL MUST cn MAY ( seeAlso $ ou $ l $ description ) ) -objectclass ( 2.5.6.12 NAME 'applicationEntity' SUP top STRUCTURAL +objectclass ( 2.5.6.12 NAME 'applicationEntity' + DESC 'RFC2256: an application entity' + SUP top STRUCTURAL MUST ( presentationAddress $ cn ) MAY ( supportedApplicationContext $ seeAlso $ ou $ o $ l $ description ) ) -objectclass ( 2.5.6.13 NAME 'dSA' SUP applicationEntity STRUCTURAL +objectclass ( 2.5.6.13 NAME 'dSA' + DESC 'RFC2256: a directory service agent (a server)' + SUP applicationEntity STRUCTURAL MAY knowledgeInformation ) -objectclass ( 2.5.6.14 NAME 'device' SUP top STRUCTURAL +objectclass ( 2.5.6.14 NAME 'device' + DESC 'RFC2256: a device' + SUP top STRUCTURAL MUST cn MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $ description ) ) -objectclass ( 2.5.6.15 NAME 'strongAuthenticationUser' SUP top AUXILIARY +objectclass ( 2.5.6.15 NAME 'strongAuthenticationUser' + DESC 'RFC2256: a strong authentication user' + SUP top AUXILIARY MUST userCertificate ) -objectclass ( 2.5.6.16 NAME 'certificationAuthority' SUP top AUXILIARY +objectclass ( 2.5.6.16 NAME 'certificationAuthority' + DESC 'RFC2256: a certificate authority' + SUP top AUXILIARY MUST ( authorityRevocationList $ certificateRevocationList $ cACertificate ) MAY crossCertificatePair ) -objectclass ( 2.5.6.17 NAME 'groupOfUniqueNames' SUP top STRUCTURAL +objectclass ( 2.5.6.17 NAME 'groupOfUniqueNames' + DESC 'RFC2256: a group of unique names (DN and Unique Identifier)' + SUP top STRUCTURAL MUST ( uniqueMember $ cn ) MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) ) -objectclass ( 2.5.6.18 NAME 'userSecurityInformation' SUP top AUXILIARY +objectclass ( 2.5.6.18 NAME 'userSecurityInformation' + DESC 'RFC2256: a user security information' + SUP top AUXILIARY MAY ( supportedAlgorithms ) ) -objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2' SUP - certificationAuthority +objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2' + SUP certificationAuthority AUXILIARY MAY ( deltaRevocationList ) ) -objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint' SUP top STRUCTURAL +objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint' + SUP top STRUCTURAL MUST ( cn ) MAY ( certificateRevocationList $ authorityRevocationList $ deltaRevocationList ) ) @@ -501,8 +576,27 @@ objectclass ( 2.5.6.20 NAME 'dmd' SUP top STRUCTURAL street $ postOfficeBox $ postalCode $ postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) ) -objectclass ( 2.5.6.21 NAME 'pkiUser' SUP top AUXILIARY - DESC 'RFC2587: PKI user' +# +# Object Classes from RFC 2252 +# + +objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject' + DESC 'RFC2252: extensible object' + SUP top AUXILIARY ) + +objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY + DESC 'RFC2252: controlling subschema (subentry)' + MAY ( dITStructureRules $ nameForms $ ditContentRules $ + objectClasses $ attributeTypes $ matchingRules $ + matchingRuleUse ) ) + +# +# Object Classes from RFC 2587 +# + +objectclass ( 2.5.6.21 NAME 'pkiUser' + DESC 'RFC2587: a PKI user' + SUP top AUXILIARY MUST userCertificate ) objectclass ( 2.5.6.22 NAME 'pkiCA' SUP top AUXILIARY @@ -514,13 +608,11 @@ objectclass ( 2.5.6.23 NAME 'deltaCRL' SUP top AUXILIARY DESC 'RFC2587: PKI user' MAY deltaRevocationList ) -objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject' - DESC 'RFC2252: extensible object' - SUP top AUXILIARY ) # -# Standard Track URI label schema from RFC2079 +# Standard Track URI label schema from RFC 2079 # + attributetype ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI' DESC 'RFC2079: Uniform Resource Identifier with optional label' EQUALITY caseExactMatch @@ -532,8 +624,9 @@ objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject' SUP top AUXILIARY ) # -# Standard Track Dynamic Directory Services from RFC2589 +# Standard Track Dynamic Directory Services from RFC 2589 # + objectclass ( 1.3.6.1.4.1.1466.101.119.2 NAME 'dynamicObject' DESC 'RFC2589: Dynamic Object' SUP top AUXILIARY ) @@ -549,7 +642,7 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees' USAGE dSAOperation ) # -# Derived from RFC1274, but with new "short names" +# Derived from RFC 1274, but with new "short names" # attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) @@ -570,7 +663,7 @@ objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject' SUP top AUXILIARY MUST userPassword ) -# RFC1274 + RFC2247 +# RFC 1274 + RFC 2247 attributetype ( 0.9.2342.19200300.100.1.25 NAME ( 'dc' 'domainComponent' ) DESC 'RFC1274/2247: domain component' @@ -578,13 +671,13 @@ attributetype ( 0.9.2342.19200300.100.1.25 SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -# RFC2247 +# RFC 2247 objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject' DESC 'RFC2247: domain component object' SUP top AUXILIARY MUST dc ) -# From RFC2377 +# RFC 2377 objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' DESC 'RFC2377: uid object' SUP top AUXILIARY MUST uid ) @@ -619,9 +712,11 @@ objectclass ( 1.3.6.1.4.1.4203.1.4.1 SUP top STRUCTURAL MAY cn ) # -# From Cosine Pilot +# From COSINE Pilot # -attributetype ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain' +attributetype ( 0.9.2342.19200300.100.1.37 + NAME 'associatedDomain' + DESC 'domain associated with object' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) @@ -631,7 +726,7 @@ attributetype ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain' # attributetype ( 1.3.6.1.4.1.250.1.32 NAME ( 'krbName' 'kerberosName' ) - DESC 'Kerberos Name' + DESC 'Kerberos principal associated with object' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) @@ -640,11 +735,11 @@ attributetype ( 1.3.6.1.4.1.250.1.32 # draft-zeilenga-ldap-features-xx.txt (supportedFeatures) # attributetype ( 1.3.6.1.4.1.4203.1.3.5 - NAME 'supportedFeatures' - DESC 'features supported by the server' - EQUALITY objectIdentifierMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 - USAGE dSAOperation ) + NAME 'supportedFeatures' + DESC 'features supported by the server' + EQUALITY objectIdentifierMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 + USAGE dSAOperation ) # # RFC 3112 (authPassword) @@ -675,18 +770,20 @@ objectclass ( 1.3.6.1.4.1.4203.1.4.7 attributetype ( 1.3.6.1.4.1.4203.1.3.1 NAME 'entry' DESC 'OpenLDAP ACL entry pseudo-attribute' + OBSOLETE SYNTAX 1.3.6.1.4.1.4203.1.1.1 SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation ) attributetype ( 1.3.6.1.4.1.4203.1.3.2 NAME 'children' DESC 'OpenLDAP ACL children pseudo-attribute' + OBSOLETE SYNTAX 1.3.6.1.4.1.4203.1.1.1 SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation ) attributetype ( 1.3.6.1.4.1.4203.666.1.5 NAME 'OpenLDAPaci' - DESC 'OpenLDAP access control information' + DESC 'OpenLDAP access control information (experimental)' EQUALITY OpenLDAPaciMatch SYNTAX 1.3.6.1.4.1.4203.666.2.1 USAGE directoryOperation ) diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema index aa24eb3830..69283fd997 100644 --- a/servers/slapd/schema/cosine.schema +++ b/servers/slapd/schema/cosine.schema @@ -149,6 +149,7 @@ attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress' # ::= {pilotAttributeType 4} # attributetype ( 0.9.2342.19200300.100.1.4 NAME 'info' + DESC 'RFC1274: general information' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{2048} ) @@ -167,6 +168,7 @@ attributetype ( 0.9.2342.19200300.100.1.4 NAME 'info' # attributetype ( 0.9.2342.19200300.100.1.5 NAME ( 'drink' 'favouriteDrink' ) + DESC 'RFC1274: favorite drink' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -184,6 +186,7 @@ attributetype ( 0.9.2342.19200300.100.1.5 # ::= {pilotAttributeType 6} # attributetype ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' + DESC 'RFC1274: room number' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -207,6 +210,7 @@ attributetype ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' # ::= {pilotAttributeType 7} # attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo' + DESC 'RFC1274: photo (G3 fax)' SYNTAX 1.3.6.1.4.1.1466.115.121.1.23{25000} ) # 9.3.8. User Class @@ -225,6 +229,7 @@ attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo' # ::= {pilotAttributeType 8} # attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass' + DESC 'RFC1274: categorory of user' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -240,6 +245,7 @@ attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass' # ::= {pilotAttributeType 9} # attributetype ( 0.9.2342.19200300.100.1.9 NAME 'host' + DESC 'RFC1274: host computer' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -255,6 +261,7 @@ attributetype ( 0.9.2342.19200300.100.1.9 NAME 'host' # ::= {pilotAttributeType 10} # attributetype ( 0.9.2342.19200300.100.1.10 NAME 'manager' + DESC 'RFC1274: DN of manager' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -270,6 +277,7 @@ attributetype ( 0.9.2342.19200300.100.1.10 NAME 'manager' # ::= {pilotAttributeType 11} # attributetype ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier' + DESC 'RFC1274: unique identifier of document' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -285,6 +293,7 @@ attributetype ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier' # ::= {pilotAttributeType 12} # attributetype ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle' + DESC 'RFC1274: title of document' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -301,6 +310,7 @@ attributetype ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle' # ::= {pilotAttributeType 13} # attributetype ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion' + DESC 'RFC1274: version of document' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -316,6 +326,7 @@ attributetype ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion' # ::= {pilotAttributeType 14} # attributetype ( 0.9.2342.19200300.100.1.14 NAME 'documentAuthor' + DESC 'RFC1274: DN of author of document' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -331,6 +342,7 @@ attributetype ( 0.9.2342.19200300.100.1.14 NAME 'documentAuthor' # ::= {pilotAttributeType 15} # attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation' + DESC 'RFC1274: location of document original' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -348,6 +360,7 @@ attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation' # ::= {pilotAttributeType 20} # attributetype ( 0.9.2342.19200300.100.1.20 + DESC 'RFC1274: home telephone number' NAME ( 'homePhone' 'homeTelephoneNumber' ) EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch @@ -364,6 +377,7 @@ attributetype ( 0.9.2342.19200300.100.1.20 # ::= {pilotAttributeType 21} # attributetype ( 0.9.2342.19200300.100.1.21 NAME 'secretary' + DESC 'RFC1274: DN of secretary' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -396,7 +410,10 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox' # ## OBSOLETE attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime' - SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 ) + DESC 'RFC1274: time of last modify, replaced by modifyTimestamp' + OBSOLETE + SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 + USAGE directoryOperation ) # 9.3.20. Last Modified By # @@ -412,8 +429,11 @@ attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime' ## OBSOLETE attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy' + DESC 'RFC1274: last modifier, replaced by modifiersName' + OBSOLETE EQUALITY distinguishedNameMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 + USAGE directoryOperation ) # 9.3.21. Domain Component # @@ -544,6 +564,7 @@ attributetype ( 0.9.2342.19200300.100.1.31 NAME 'cNAMERecord' # ::= {pilotAttributeType 38} # attributetype ( 0.9.2342.19200300.100.1.38 NAME 'associatedName' + DESC 'RFC1274: DN of entry associated with domain' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -560,6 +581,7 @@ attributetype ( 0.9.2342.19200300.100.1.38 NAME 'associatedName' # ::= {pilotAttributeType 39} # attributetype ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' + DESC 'RFC1274: home postal address' EQUALITY caseIgnoreListMatch SUBSTR caseIgnoreListSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) @@ -576,6 +598,7 @@ attributetype ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' # ::= {pilotAttributeType 40} # attributetype ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle' + DESC 'RFC1274: personal title' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -594,6 +617,7 @@ attributetype ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle' # attributetype ( 0.9.2342.19200300.100.1.41 NAME ( 'mobile' 'mobileTelephoneNumber' ) + DESC 'RFC1274: mobile telephone number' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) @@ -611,6 +635,7 @@ attributetype ( 0.9.2342.19200300.100.1.41 # attributetype ( 0.9.2342.19200300.100.1.42 NAME ( 'pager' 'pagerTelephoneNumber' ) + DESC 'RFC1274: pager telephone number' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) @@ -628,6 +653,7 @@ attributetype ( 0.9.2342.19200300.100.1.42 # attributetype ( 0.9.2342.19200300.100.1.43 NAME ( 'co' 'friendlyCountryName' ) + DESC 'RFC1274: friendly country name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) @@ -648,6 +674,7 @@ attributetype ( 0.9.2342.19200300.100.1.43 # ::= {pilotAttributeType 44} # attributetype ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier' + DESC 'RFC1274: unique identifer' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -668,6 +695,7 @@ attributetype ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier' # ::= {pilotAttributeType 45} # attributetype ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus' + DESC 'RFC1274: organizational status' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -688,6 +716,7 @@ attributetype ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus' # ::= {pilotAttributeType 46} # attributetype ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox' + DESC 'RFC1274: Janet mailbox' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) @@ -719,6 +748,7 @@ attributetype ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox' # attributetype ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption' + DESC 'RFC1274: mail preference option' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) # 9.3.38. Building Name @@ -733,6 +763,7 @@ attributetype ( 0.9.2342.19200300.100.1.47 # ::= {pilotAttributeType 48} # attributetype ( 0.9.2342.19200300.100.1.48 NAME 'buildingName' + DESC 'RFC1274: name of building' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) @@ -749,6 +780,7 @@ attributetype ( 0.9.2342.19200300.100.1.48 NAME 'buildingName' # ::= {pilotAttributeType 49} # attributetype ( 0.9.2342.19200300.100.1.49 NAME 'dSAQuality' + DESC 'RFC1274: DSA Quality' SYNTAX 1.3.6.1.4.1.1466.115.121.1.19 SINGLE-VALUE ) # 9.3.40. Single Level Quality @@ -763,6 +795,7 @@ attributetype ( 0.9.2342.19200300.100.1.49 NAME 'dSAQuality' # ::= {pilotAttributeType 50} # attributetype ( 0.9.2342.19200300.100.1.50 NAME 'singleLevelQuality' + DESC 'RFC1274: Single Level Quality' SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE ) # 9.3.41. Subtree Minimum Quality @@ -778,6 +811,7 @@ attributetype ( 0.9.2342.19200300.100.1.50 NAME 'singleLevelQuality' # ::= {pilotAttributeType 51} # attributetype ( 0.9.2342.19200300.100.1.51 NAME 'subtreeMinimumQuality' + DESC 'RFC1274: Subtree Mininum Quality' SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE ) # 9.3.42. Subtree Maximum Quality @@ -793,6 +827,7 @@ attributetype ( 0.9.2342.19200300.100.1.51 NAME 'subtreeMinimumQuality' # ::= {pilotAttributeType 52} # attributetype ( 0.9.2342.19200300.100.1.52 NAME 'subtreeMaximumQuality' + DESC 'RFC1274: Subtree Maximun Quality' SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE ) # 9.3.43. Personal Signature @@ -814,6 +849,7 @@ attributetype ( 0.9.2342.19200300.100.1.52 NAME 'subtreeMaximumQuality' # ::= {pilotAttributeType 53} # attributetype ( 0.9.2342.19200300.100.1.53 NAME 'personalSignature' + DESC 'RFC1274: Personal Signature (G3 fax)' SYNTAX 1.3.6.1.4.1.1466.115.121.1.23 ) # 9.3.44. DIT Redirect @@ -831,8 +867,9 @@ attributetype ( 0.9.2342.19200300.100.1.53 NAME 'personalSignature' # ::= {pilotAttributeType 54} # attributetype ( 0.9.2342.19200300.100.1.54 NAME 'dITRedirect' - EQUALITY distinguishedNameMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) + DESC 'RFC1274: DIT Redirect' + EQUALITY distinguishedNameMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) # 9.3.45. Audio # @@ -847,7 +884,8 @@ attributetype ( 0.9.2342.19200300.100.1.54 NAME 'dITRedirect' # ::= {pilotAttributeType 55} # attributetype ( 0.9.2342.19200300.100.1.55 NAME 'audio' - SYNTAX 1.3.6.1.4.1.1466.115.121.1.4{25000} ) + DESC 'RFC1274: audio (u-law)' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.4{25000} ) # 9.3.46. Publisher of Document # @@ -860,6 +898,7 @@ attributetype ( 0.9.2342.19200300.100.1.55 NAME 'audio' # ::= {pilotAttributeType 56} # attributetype ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher' + DESC 'RFC1274: publisher of document' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) @@ -984,6 +1023,7 @@ attributetype ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher' # ::= {pilotObjectClass 3} # objectclass ( 0.9.2342.19200300.100.4.3 NAME 'pilotObject' + DESC 'RFC1274: pilot object' SUP top AUXILIARY MAY ( info $ photo $ manager $ uniqueIdentifier $ lastModifiedTime $ lastModifiedBy $ dITRedirect $ audio )