From: Kurt Zeilenga Date: Wed, 13 Oct 1999 21:57:44 +0000 (+0000) Subject: s/^attribute/attributetype/ X-Git-Tag: UCDATA_2_4~344 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1165cc505198af0b497c7c9d99344f1438c7871;p=openldap s/^attribute/attributetype/ --- diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index e5403ba8a8..a8619ca3a4 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -14,81 +14,81 @@ # Standard X.501(93) Operational Attribute Types from RFC2252 -attribute ( 2.5.18.1 NAME 'createTimestamp' EQUALITY generalizedTimeMatch +attributetype ( 2.5.18.1 NAME 'createTimestamp' EQUALITY generalizedTimeMatch ORDERING generalizedTimeOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation ) -attribute ( 2.5.18.2 NAME 'modifyTimestamp' EQUALITY generalizedTimeMatch +attributetype ( 2.5.18.2 NAME 'modifyTimestamp' EQUALITY generalizedTimeMatch ORDERING generalizedTimeOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation ) -attribute ( 2.5.18.3 NAME 'creatorsName' EQUALITY distinguishedNameMatch +attributetype ( 2.5.18.3 NAME 'creatorsName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation ) -attribute ( 2.5.18.4 NAME 'modifiersName' EQUALITY distinguishedNameMatch +attributetype ( 2.5.18.4 NAME 'modifiersName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation ) -attribute ( 2.5.18.10 NAME 'subschemaSubentry' +attributetype ( 2.5.18.10 NAME 'subschemaSubentry' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION SINGLE-VALUE USAGE directoryOperation ) -attribute ( 2.5.21.5 NAME 'attributeTypes' +attributetype ( 2.5.21.5 NAME 'attributeTypes' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.3 USAGE directoryOperation ) -attribute ( 2.5.21.6 NAME 'objectClasses' +attributetype ( 2.5.21.6 NAME 'objectClasses' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.37 USAGE directoryOperation ) -attribute ( 2.5.21.4 NAME 'matchingRules' +attributetype ( 2.5.21.4 NAME 'matchingRules' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.30 USAGE directoryOperation ) -attribute ( 2.5.21.8 NAME 'matchingRuleUse' +attributetype ( 2.5.21.8 NAME 'matchingRuleUse' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation ) # LDAP Operational Attributes from RFC2252 -attribute ( 1.3.6.1.4.1.1466.101.120.5 NAME 'namingContexts' +attributetype ( 1.3.6.1.4.1.1466.101.120.5 NAME 'namingContexts' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 USAGE dSAOperation ) -attribute ( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' +attributetype ( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE dSAOperation ) -attribute ( 1.3.6.1.4.1.1466.101.120.7 NAME 'supportedExtension' +attributetype ( 1.3.6.1.4.1.1466.101.120.7 NAME 'supportedExtension' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation ) -attribute ( 1.3.6.1.4.1.1466.101.120.13 NAME 'supportedControl' +attributetype ( 1.3.6.1.4.1.1466.101.120.13 NAME 'supportedControl' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation ) -attribute ( 1.3.6.1.4.1.1466.101.120.14 NAME 'supportedSASLMechanisms' +attributetype ( 1.3.6.1.4.1.1466.101.120.14 NAME 'supportedSASLMechanisms' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dSAOperation ) -attribute ( 1.3.6.1.4.1.1466.101.120.15 NAME 'supportedLDAPVersion' +attributetype ( 1.3.6.1.4.1.1466.101.120.15 NAME 'supportedLDAPVersion' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 USAGE dSAOperation ) # LDAP Subschema Atrribute from RFC2252 -attribute ( 1.3.6.1.4.1.1466.101.120.16 NAME 'ldapSyntaxes' +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 ) # X.500 Subschema attributes from RFC2252 -attribute ( 2.5.21.1 NAME 'dITStructureRules' EQUALITY integerFirstComponentMatch +attributetype ( 2.5.21.1 NAME 'dITStructureRules' EQUALITY integerFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 USAGE directoryOperation ) -attribute ( 2.5.21.7 NAME 'nameForms' +attributetype ( 2.5.21.7 NAME 'nameForms' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.35 USAGE directoryOperation ) -attribute ( 2.5.21.2 NAME 'dITContentRules' +attributetype ( 2.5.21.2 NAME 'dITContentRules' EQUALITY objectIdentifierFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation ) @@ -104,59 +104,59 @@ objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY # Standard attribute types from RFC2256 -attribute ( 2.5.4.0 NAME 'objectClass' EQUALITY objectIdentifierMatch +attributetype ( 2.5.4.0 NAME 'objectClass' EQUALITY objectIdentifierMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 ) -attribute ( 2.5.4.1 NAME 'aliasedObjectName' EQUALITY distinguishedNameMatch +attributetype ( 2.5.4.1 NAME 'aliasedObjectName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) # Defined, but no longer used -attribute ( 2.5.4.2 NAME 'knowledgeInformation' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.2 NAME 'knowledgeInformation' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} ) # Place here since other attribute types derive from it -attribute ( 2.5.4.41 NAME 'name' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.41 NAME 'name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} ) -attribute ( 2.5.4.3 NAME ( 'cn' 'commonName' ) SUP name ) +attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' ) SUP name ) -attribute ( 2.5.4.4 NAME ( 'sn' 'surname' ) SUP name ) +attributetype ( 2.5.4.4 NAME ( 'sn' 'surname' ) SUP name ) -attribute ( 2.5.4.5 NAME 'serialNumber' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.5 NAME 'serialNumber' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} ) # (2-letter code from ISO 3166) -attribute ( 2.5.4.6 NAME ( 'c' 'countryName' ) SUP name SINGLE-VALUE ) +attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' ) SUP name SINGLE-VALUE ) -attribute ( 2.5.4.7 NAME ( 'l' 'localityName' ) SUP name ) +attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' ) SUP name ) -attribute ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' ) SUP name ) +attributetype ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' ) SUP name ) -attribute ( 2.5.4.9 NAME ( 'street' 'streetAddress' ) EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.9 NAME ( 'street' 'streetAddress' ) EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) -attribute ( 2.5.4.10 NAME ( 'o' 'organizationName' ) SUP name ) +attributetype ( 2.5.4.10 NAME ( 'o' 'organizationName' ) SUP name ) -attribute ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' ) SUP name ) +attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' ) SUP name ) -attribute ( 2.5.4.12 NAME 'title' SUP name ) +attributetype ( 2.5.4.12 NAME 'title' SUP name ) -attribute ( 2.5.4.13 NAME 'description' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.13 NAME 'description' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} ) # Obsoleted by enhancedSearchGuide -attribute ( 2.5.4.14 NAME 'searchGuide' +attributetype ( 2.5.4.14 NAME 'searchGuide' SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 ) -attribute ( 2.5.4.15 NAME 'businessCategory' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.15 NAME 'businessCategory' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) @@ -164,59 +164,59 @@ attribute ( 2.5.4.15 NAME 'businessCategory' EQUALITY caseIgnoreMatch #attribute ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch # SUBSTR caseIgnoreListSubstringsMatch # SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -attribute ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch +attributetype ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -attribute ( 2.5.4.17 NAME 'postalCode' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.17 NAME 'postalCode' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) -attribute ( 2.5.4.18 NAME 'postOfficeBox' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.18 NAME 'postOfficeBox' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) -attribute ( 2.5.4.19 NAME 'physicalDeliveryOfficeName' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.19 NAME 'physicalDeliveryOfficeName' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) -attribute ( 2.5.4.20 NAME 'telephoneNumber' EQUALITY telephoneNumberMatch +attributetype ( 2.5.4.20 NAME 'telephoneNumber' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} ) -attribute ( 2.5.4.21 NAME 'telexNumber' +attributetype ( 2.5.4.21 NAME 'telexNumber' SYNTAX 1.3.6.1.4.1.1466.115.121.1.52 ) -attribute ( 2.5.4.22 NAME 'teletexTerminalIdentifier' +attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier' SYNTAX 1.3.6.1.4.1.1466.115.121.1.51 ) -attribute ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) +attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 ) -attribute ( 2.5.4.24 NAME 'x121Address' EQUALITY numericStringMatch +attributetype ( 2.5.4.24 NAME 'x121Address' EQUALITY numericStringMatch SUBSTR numericStringSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} ) -attribute ( 2.5.4.25 NAME 'internationaliSDNNumber' EQUALITY numericStringMatch +attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber' EQUALITY numericStringMatch SUBSTR numericStringSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} ) -attribute ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress +attributetype ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -attribute ( 2.5.4.27 NAME 'destinationIndicator' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.27 NAME 'destinationIndicator' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} ) -attribute ( 2.5.4.28 NAME 'preferredDeliveryMethod' +attributetype ( 2.5.4.28 NAME 'preferredDeliveryMethod' SYNTAX 1.3.6.1.4.1.1466.115.121.1.14 SINGLE-VALUE ) -attribute ( 2.5.4.29 NAME 'presentationAddress' +attributetype ( 2.5.4.29 NAME 'presentationAddress' EQUALITY presentationAddressMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 SINGLE-VALUE ) -attribute ( 2.5.4.30 NAME 'supportedApplicationContext' +attributetype ( 2.5.4.30 NAME 'supportedApplicationContext' EQUALITY objectIdentifierMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 ) @@ -230,89 +230,89 @@ attribute ( 2.5.4.30 NAME 'supportedApplicationContext' # dn-valued attribute types derive from it. So at most, 'dn' would # be a subtype of distinguishedName. -attribute ( 2.5.4.49 NAME 'distinguishedName' +attributetype ( 2.5.4.49 NAME 'distinguishedName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( 2.5.4.31 NAME 'member' SUP distinguishedName ) +attributetype ( 2.5.4.31 NAME 'member' SUP distinguishedName ) -attribute ( 2.5.4.32 NAME 'owner' SUP distinguishedName ) +attributetype ( 2.5.4.32 NAME 'owner' SUP distinguishedName ) -attribute ( 2.5.4.33 NAME 'roleOccupant' SUP distinguishedName ) +attributetype ( 2.5.4.33 NAME 'roleOccupant' SUP distinguishedName ) -attribute ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName ) +attributetype ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName ) -attribute ( 2.5.4.35 NAME 'userPassword' EQUALITY octetStringMatch +attributetype ( 2.5.4.35 NAME 'userPassword' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} ) # Must be stored and requested in the binary form, as # userCertificate;binary -attribute ( 2.5.4.36 NAME 'userCertificate' +attributetype ( 2.5.4.36 NAME 'userCertificate' SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 ) # As above -attribute ( 2.5.4.37 NAME 'cACertificate' +attributetype ( 2.5.4.37 NAME 'cACertificate' SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 ) # As above -attribute ( 2.5.4.38 NAME 'authorityRevocationList' +attributetype ( 2.5.4.38 NAME 'authorityRevocationList' SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 ) # As above -attribute ( 2.5.4.39 NAME 'certificateRevocationList' +attributetype ( 2.5.4.39 NAME 'certificateRevocationList' SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 ) # As above -attribute ( 2.5.4.40 NAME 'crossCertificatePair' +attributetype ( 2.5.4.40 NAME 'crossCertificatePair' SYNTAX 1.3.6.1.4.1.1466.115.121.1.10 ) # 2.5.4.41 is 'name', moved above since other attribute types derive from it -attribute ( 2.5.4.42 NAME 'givenName' SUP name ) +attributetype ( 2.5.4.42 NAME 'givenName' SUP name ) -attribute ( 2.5.4.43 NAME 'initials' SUP name ) +attributetype ( 2.5.4.43 NAME 'initials' SUP name ) -attribute ( 2.5.4.45 NAME 'x500UniqueIdentifier' EQUALITY bitStringMatch +attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier' EQUALITY bitStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 ) -attribute ( 2.5.4.46 NAME 'dnQualifier' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.46 NAME 'dnQualifier' EQUALITY caseIgnoreMatch ORDERING caseIgnoreOrderingMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 ) -attribute ( 2.5.4.47 NAME 'enhancedSearchGuide' +attributetype ( 2.5.4.47 NAME 'enhancedSearchGuide' SYNTAX 1.3.6.1.4.1.1466.115.121.1.21 ) -attribute ( 2.5.4.48 NAME 'protocolInformation' +attributetype ( 2.5.4.48 NAME 'protocolInformation' EQUALITY protocolInformationMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 ) # 2.5.4.49 is distinguishedName, moved up -attribute ( 2.5.4.50 NAME 'uniqueMember' EQUALITY uniqueMemberMatch +attributetype ( 2.5.4.50 NAME 'uniqueMember' EQUALITY uniqueMemberMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 ) -attribute ( 2.5.4.51 NAME 'houseIdentifier' EQUALITY caseIgnoreMatch +attributetype ( 2.5.4.51 NAME 'houseIdentifier' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} ) # This attribute is to be stored and requested in the binary form, as # 'supportedAlgorithms;binary'. -attribute ( 2.5.4.52 NAME 'supportedAlgorithms' +attributetype ( 2.5.4.52 NAME 'supportedAlgorithms' SYNTAX 1.3.6.1.4.1.1466.115.121.1.49 ) # This attribute is to be stored and requested in the binary form, as # 'deltaRevocationList;binary'. -attribute ( 2.5.4.53 NAME 'deltaRevocationList' +attributetype ( 2.5.4.53 NAME 'deltaRevocationList' SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 ) -attribute ( 2.5.4.54 NAME 'dmdName' SUP name ) +attributetype ( 2.5.4.54 NAME 'dmdName' SUP name ) # Standard object classes from RFC2256 @@ -452,7 +452,7 @@ objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject' # # Standard Track URI label schema from RFC2079 # -attribute ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI' +attributetype ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI' DESC 'Uniform Resource Identifier with optional label' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) @@ -464,7 +464,7 @@ objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject' # From draft-ietf-ldapext-nameref-00.txt # used to represent referrals in the directory # -attribute ( 2.16.840.1.113730.3.1.34 NAME 'ref' DESC 'URL Reference' +attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref' DESC 'URL Reference' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE distributedOperation ) diff --git a/servers/slapd/schema/inetorgperson.schema b/servers/slapd/schema/inetorgperson.schema index 3a914e07f6..80cb6384c9 100644 --- a/servers/slapd/schema/inetorgperson.schema +++ b/servers/slapd/schema/inetorgperson.schema @@ -9,7 +9,7 @@ # carLicense # This multivalued field is used to record the values of the license or # registration plate associated with an individual. -attribute ( 2.16.840.1.113730.3.1.1 +attributetype ( 2.16.840.1.113730.3.1.1 NAME 'carLicense' DESC 'vehicle license or registration plate' EQUALITY caseIgnoreMatch @@ -19,7 +19,7 @@ attribute ( 2.16.840.1.113730.3.1.1 # departmentNumber # Code for department to which a person belongs. This can also be # strictly numeric (e.g., 1234) or alphanumeric (e.g., ABC/123). -attribute ( 2.16.840.1.113730.3.1.2 +attributetype ( 2.16.840.1.113730.3.1.2 NAME 'departmentNumber' DESC 'identifies a department within an organization' EQUALITY caseIgnoreMatch @@ -31,7 +31,7 @@ attribute ( 2.16.840.1.113730.3.1.2 # is useful to be able to identify a name to be used. Since other attri- # bute types such as 'cn' are multivalued, an additional attribute type is # needed. Display name is defined for this purpose. -attribute ( 2.16.840.1.113730.3.1.241 +attributetype ( 2.16.840.1.113730.3.1.241 NAME 'displayName' DESC 'preferred name of a person to be used when displaying entries' EQUALITY caseIgnoreMatch @@ -42,7 +42,7 @@ attribute ( 2.16.840.1.113730.3.1.241 # employeeNumber # Numeric or alphanumeric identifier assigned to a person, typically based # on order of hire or association with an organization. Single valued. -attribute ( 2.16.840.1.113730.3.1.3 +attributetype ( 2.16.840.1.113730.3.1.3 NAME 'employeeNumber' DESC 'numerically identifies an employee within an organization' EQUALITY caseIgnoreMatch @@ -54,7 +54,7 @@ attribute ( 2.16.840.1.113730.3.1.3 # Used to identify the employer to employee relationship. Typical values # used will be "Contractor", "Employee", "Intern", "Temp", "External", and # "Unknown" but any value may be used. -attribute ( 2.16.840.1.113730.3.1.4 +attributetype ( 2.16.840.1.113730.3.1.4 NAME 'employeeType' DESC 'type of employment for a person' EQUALITY caseIgnoreMatch @@ -71,7 +71,7 @@ attribute ( 2.16.840.1.113730.3.1.4 # tion of the Accept-Language header field defined in [RFC2068] with one # exception: the sequence "Accept-Language" ":" should be omitted. This # is a single valued attribute type. -attribute ( 2.16.840.1.113730.3.1.39 +attributetype ( 2.16.840.1.113730.3.1.39 NAME 'preferredLanguage' DESC 'preferred written or spoken language for a person' EQUALITY caseIgnoreMatch @@ -86,7 +86,7 @@ attribute ( 2.16.840.1.113730.3.1.39 # cate chain and the signed attribute that describes their algorithm capa- # bilities, stored as binary data. If available, this attribute is # preferred over the userCertificate attribute for S/MIME applications. -attribute ( 2.16.840.1.113730.3.1.40 +attributetype ( 2.16.840.1.113730.3.1.40 NAME 'userSMIMECertificate' DESC 'signed message used to support S/MIME' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) @@ -97,7 +97,7 @@ attribute ( 2.16.840.1.113730.3.1.40 # the userPKCS12 attribute should be used. This attribute is to be stored # and requested in binary form, as 'userPKCS12;binary'. The attribute # values are PFX PDUs stored as binary data. -attribute ( 2.16.840.1.113730.3.1.216 +attributetype ( 2.16.840.1.113730.3.1.216 NAME 'userPKCS12' DESC 'PKCS #12 PFX PDU for exchange of personal identity information' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema index 1ad862e287..6778ca1d55 100644 --- a/servers/slapd/schema/misc.schema +++ b/servers/slapd/schema/misc.schema @@ -7,19 +7,19 @@ # # draft-lachman-laser-ldap-mail-routing-00.txt # -attribute ( 2.16.840.1.113730.3.1.13 NAME 'mailAlternateAddress' +attributetype ( 2.16.840.1.113730.3.1.13 NAME 'mailAlternateAddress' DESC 'RFC 822 email address of this recipient' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) -attribute ( 2.16.840.1.113730.3.1.18 NAME 'mailHost' +attributetype ( 2.16.840.1.113730.3.1.18 NAME 'mailHost' DESC 'alternate RFC 822 email address of this recipient' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) -attribute ( 2.16.840.1.113730.3.1.47 NAME 'mailRoutingAddress' +attributetype ( 2.16.840.1.113730.3.1.47 NAME 'mailRoutingAddress' DESC 'fully qualified hostname of the SMTP MTA that handles messages for this recipient' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} @@ -48,7 +48,7 @@ objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' SUP top AUXILIARY MUST uid ) # Origin of this has not been identified. We had it and Netscape has it # too. -attribute ( 1.3.6.1.4.1.250.1.60 NAME ( 'timeToLive' 'ttl' ) +attributetype ( 1.3.6.1.4.1.250.1.60 NAME ( 'timeToLive' 'ttl' ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) objectclass ( 1.3.6.1.4.1.250.3.18 NAME 'cacheObject' SUP top MAY ttl ) diff --git a/servers/slapd/schema/nadf.schema b/servers/slapd/schema/nadf.schema index 2daca76f8d..dc88d20914 100644 --- a/servers/slapd/schema/nadf.schema +++ b/servers/slapd/schema/nadf.schema @@ -22,21 +22,21 @@ # The spec says "leading zero is significant". Is this really a # numeric string? -attribute ( 2.6.6.5.2.4.1 NAME 'fipsStateNumericCode' +attributetype ( 2.6.6.5.2.4.1 NAME 'fipsStateNumericCode' EQUALITY numericStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{2} ) # It is probably inconvenient to give this attribute that syntax # (Printable String) instead of Directory String. -attribute ( 2.6.6.5.2.4.2 NAME 'fipsStateAlphaCode' +attributetype ( 2.6.6.5.2.4.2 NAME 'fipsStateAlphaCode' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{2} ) # The spec says "leading zeros are significant". Is this really a # numeric string? -attribute ( 2.6.6.5.2.4.3 NAME 'fipsCountyNumericCode' +attributetype ( 2.6.6.5.2.4.3 NAME 'fipsCountyNumericCode' EQUALITY numericStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} ) @@ -45,34 +45,34 @@ attribute ( 2.6.6.5.2.4.3 NAME 'fipsCountyNumericCode' # The spec says "leading zeros are significant". Is this really a # numeric string? -attribute ( 2.6.6.5.2.4.4 NAME ( 'fipsPlaceNumericCode' 'fips55' ) +attributetype ( 2.6.6.5.2.4.4 NAME ( 'fipsPlaceNumericCode' 'fips55' ) EQUALITY numericStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} ) -attribute ( 2.6.6.5.2.4.5 NAME 'ansiOrgNumericCode' +attributetype ( 2.6.6.5.2.4.5 NAME 'ansiOrgNumericCode' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) # Apparently, 'ad' is an alias for 'addmdName' -attribute ( 2.6.6.5.2.4.6 NAME ( 'addmdName' 'ad' ) +attributetype ( 2.6.6.5.2.4.6 NAME ( 'addmdName' 'ad' ) EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) # I don't know what syntax to give this. I will use binary for the # time being. -attribute ( 2.6.6.5.2.4.7 NAME 'nadfSearchGuide' +attributetype ( 2.6.6.5.2.4.7 NAME 'nadfSearchGuide' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) -attribute ( 2.6.6.5.2.4.8 NAME 'supplementaryInformation' +attributetype ( 2.6.6.5.2.4.8 NAME 'supplementaryInformation' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{76} ) -attribute ( 2.6.6.5.2.4.9 NAME 'namingLink' +attributetype ( 2.6.6.5.2.4.9 NAME 'namingLink' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink' +attributetype ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) @@ -83,11 +83,11 @@ attribute ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink' # define the string with IA5 syntax and we don't have a # clear base for this. -attribute ( 2.6.6.5.2.4.15 NAME 'logicalDSAReference' +attributetype ( 2.6.6.5.2.4.15 NAME 'logicalDSAReference' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 2.6.6.5.2.4.16 NAME 'multiMediaInformation' +attributetype ( 2.6.6.5.2.4.16 NAME 'multiMediaInformation' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) # Number 17, 18 and 19 are EDI-related attributes for the nadfEDIUser diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema index 7c5ccf2b06..4e890e435f 100644 --- a/servers/slapd/schema/nis.schema +++ b/servers/slapd/schema/nis.schema @@ -15,127 +15,127 @@ # Attribute Type Definitions -attribute ( 1.3.6.1.1.1.1.0 NAME 'uidNumber' +attributetype ( 1.3.6.1.1.1.1.0 NAME 'uidNumber' DESC 'An integer uniquely identifying a user in an administrative domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.1 NAME 'gidNumber' +attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber' DESC 'An integer uniquely identifying a group in an administrative domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) # TBC: caseIgnoreIA5SubstringsMatch is not defined -attribute ( 1.3.6.1.1.1.1.2 NAME 'gecos' +attributetype ( 1.3.6.1.1.1.1.2 NAME 'gecos' DESC 'The GECOS field; the common name' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.3 NAME 'homeDirectory' +attributetype ( 1.3.6.1.1.1.1.3 NAME 'homeDirectory' DESC 'The absolute path to the home directory' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.4 NAME 'loginShell' +attributetype ( 1.3.6.1.1.1.1.4 NAME 'loginShell' DESC 'The path to the login shell' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.5 NAME 'shadowLastChange' +attributetype ( 1.3.6.1.1.1.1.5 NAME 'shadowLastChange' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.6 NAME 'shadowMin' +attributetype ( 1.3.6.1.1.1.1.6 NAME 'shadowMin' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.7 NAME 'shadowMax' +attributetype ( 1.3.6.1.1.1.1.7 NAME 'shadowMax' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.8 NAME 'shadowWarning' +attributetype ( 1.3.6.1.1.1.1.8 NAME 'shadowWarning' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.9 NAME 'shadowInactive' +attributetype ( 1.3.6.1.1.1.1.9 NAME 'shadowInactive' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.10 NAME 'shadowExpire' +attributetype ( 1.3.6.1.1.1.1.10 NAME 'shadowExpire' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.11 NAME 'shadowFlag' +attributetype ( 1.3.6.1.1.1.1.11 NAME 'shadowFlag' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) # TBC: caseIgnoreIA5SubstringsMatch is not defined -attribute ( 1.3.6.1.1.1.1.12 NAME 'memberUid' +attributetype ( 1.3.6.1.1.1.1.12 NAME 'memberUid' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) # TBC: caseIgnoreIA5SubstringsMatch is not defined -attribute ( 1.3.6.1.1.1.1.13 NAME 'memberNisNetgroup' +attributetype ( 1.3.6.1.1.1.1.13 NAME 'memberNisNetgroup' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) -attribute ( 1.3.6.1.1.1.1.14 NAME 'nisNetgroupTriple' +attributetype ( 1.3.6.1.1.1.1.14 NAME 'nisNetgroupTriple' DESC 'Netgroup triple' SYNTAX 1.3.6.1.1.1.0.0 ) -attribute ( 1.3.6.1.1.1.1.15 NAME 'ipServicePort' +attributetype ( 1.3.6.1.1.1.1.15 NAME 'ipServicePort' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.16 NAME 'ipServiceProtocol' +attributetype ( 1.3.6.1.1.1.1.16 NAME 'ipServiceProtocol' SUP name ) -attribute ( 1.3.6.1.1.1.1.17 NAME 'ipProtocolNumber' +attributetype ( 1.3.6.1.1.1.1.17 NAME 'ipProtocolNumber' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.18 NAME 'oncRpcNumber' +attributetype ( 1.3.6.1.1.1.1.18 NAME 'oncRpcNumber' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.19 NAME 'ipHostNumber' +attributetype ( 1.3.6.1.1.1.1.19 NAME 'ipHostNumber' DESC 'IP address as a dotted decimal, eg. 192.168.1.1, omitting leading zeros' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} ) -attribute ( 1.3.6.1.1.1.1.20 NAME 'ipNetworkNumber' +attributetype ( 1.3.6.1.1.1.1.20 NAME 'ipNetworkNumber' DESC 'IP network as a dotted decimal, eg. 192.168, omitting leading zeros' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.21 NAME 'ipNetmaskNumber' +attributetype ( 1.3.6.1.1.1.1.21 NAME 'ipNetmaskNumber' DESC 'IP netmask as a dotted decimal, eg. 255.255.255.0, omitting leading zeros' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE ) -attribute ( 1.3.6.1.1.1.1.22 NAME 'macAddress' +attributetype ( 1.3.6.1.1.1.1.22 NAME 'macAddress' DESC 'MAC address in maximal, colon separated hex notation, eg. 00:00:92:90:ee:e2' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} ) -attribute ( 1.3.6.1.1.1.1.23 NAME 'bootParameter' +attributetype ( 1.3.6.1.1.1.1.23 NAME 'bootParameter' DESC 'rpc.bootparamd parameter' SYNTAX 1.3.6.1.1.1.0.1 ) -attribute ( 1.3.6.1.1.1.1.24 NAME 'bootFile' +attributetype ( 1.3.6.1.1.1.1.24 NAME 'bootFile' DESC 'Boot image name' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) -attribute ( 1.3.6.1.1.1.1.26 NAME 'nisMapName' +attributetype ( 1.3.6.1.1.1.1.26 NAME 'nisMapName' SUP name ) # TBC: caseIgnoreIA5SubstringsMatch is not defined -attribute ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry' +attributetype ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} SINGLE-VALUE ) diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema index 37db8c7b04..ed9e18e425 100644 --- a/servers/slapd/schema/pilot.schema +++ b/servers/slapd/schema/pilot.schema @@ -21,85 +21,85 @@ # Believe it or not, this is case-insensitive -attribute ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) +attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress' +attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' ) +attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' ) EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) -attribute ( 0.9.2342.19200300.100.1.4 NAME 'info' EQUALITY caseIgnoreMatch +attributetype ( 0.9.2342.19200300.100.1.4 NAME 'info' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.5 NAME ( 'drink' 'favouriteDrink' ) +attributetype ( 0.9.2342.19200300.100.1.5 NAME ( 'drink' 'favouriteDrink' ) EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' +attributetype ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.7 NAME 'photo' +attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) -attribute ( 0.9.2342.19200300.100.1.8 NAME 'userClass' +attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.9 NAME 'host' +attributetype ( 0.9.2342.19200300.100.1.9 NAME 'host' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.10 NAME 'manager' +attributetype ( 0.9.2342.19200300.100.1.10 NAME 'manager' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier' +attributetype ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle' +attributetype ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion' +attributetype ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.14 NAME 'documentAuthor' +attributetype ( 0.9.2342.19200300.100.1.14 NAME 'documentAuthor' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation' +attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.20 NAME ( 'homeTelephoneNumber' 'homePhone' ) +attributetype ( 0.9.2342.19200300.100.1.20 NAME ( 'homeTelephoneNumber' 'homePhone' ) EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) -attribute ( 0.9.2342.19200300.100.1.21 NAME 'secretary' +attributetype ( 0.9.2342.19200300.100.1.21 NAME 'secretary' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) # Netscape defines this with syntax 1.15 TBC -attribute ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox' +attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox' SYNTAX 1.3.6.1.4.1.1466.115.121.1.39 ) # Netscape defines this with syntax 1.15 TBC # Mathcing rules for this are unknown -attribute ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime' +attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime' SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 ) -attribute ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy' +attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -110,14 +110,14 @@ attribute ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy' # EQUALITY caseIgnoreIA5Match # SUBSTR caseIgnoreIA5SubstringsMatch # SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) -attribute ( 0.9.2342.19200300.100.1.25 NAME 'dc' +attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) # This is aRecord in RFC1274. However, objectclass dNSDomain as we # and Netscape use it is very different. -attribute ( 0.9.2342.19200300.100.1.26 NAME 'dNSRecord' +attributetype ( 0.9.2342.19200300.100.1.26 NAME 'dNSRecord' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) # 0.9.2342.19200300.100.1.27 was probably intended to be mDRecord in @@ -134,11 +134,11 @@ attribute ( 0.9.2342.19200300.100.1.26 NAME 'dNSRecord' # EQUALITY caseIgnoreIA5Match # SUBSTR caseIgnoreIA5SubstringsMatch # SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain' +attributetype ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.38 NAME 'associatedName' +attributetype ( 0.9.2342.19200300.100.1.38 NAME 'associatedName' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) @@ -146,37 +146,37 @@ attribute ( 0.9.2342.19200300.100.1.38 NAME 'associatedName' # We take the matching rules from postalAddress in RFC2256 # Show stopper: we don't have the definition of caseIgnoreListSubstringsMatch -attribute ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' +attributetype ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' EQUALITY caseIgnoreListMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -attribute ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle' +attributetype ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.41 NAME ( 'mobileTelephoneNumber' 'mobile' ) +attributetype ( 0.9.2342.19200300.100.1.41 NAME ( 'mobileTelephoneNumber' 'mobile' ) EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) -attribute ( 0.9.2342.19200300.100.1.42 NAME ( 'pagerTelephoneNumber' 'pager' ) +attributetype ( 0.9.2342.19200300.100.1.42 NAME ( 'pagerTelephoneNumber' 'pager' ) EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) -attribute ( 0.9.2342.19200300.100.1.43 NAME ( 'co' 'friendlyCountryName' ) +attributetype ( 0.9.2342.19200300.100.1.43 NAME ( 'co' 'friendlyCountryName' ) EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier' +attributetype ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus' +attributetype ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox' +attributetype ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) @@ -184,10 +184,10 @@ attribute ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox' # in RFC2252 without explanation. The SINGLE-VALUE thing comes from # Netscape and is not backed by RFC1274. -attribute ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption' +attributetype ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption' SYNTAX 1.3.6.1.4.1.1466.115.121.1.32 SINGLE-VALUE ) -attribute ( 0.9.2342.19200300.100.1.48 NAME 'buildingName' +attributetype ( 0.9.2342.19200300.100.1.48 NAME 'buildingName' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) @@ -200,24 +200,24 @@ attribute ( 0.9.2342.19200300.100.1.48 NAME 'buildingName' # about this but RFC2252 does not seem to list a specific syntax. # We had this as 'bin' -attribute ( 0.9.2342.19200300.100.1.53 NAME 'personalSignature' +attributetype ( 0.9.2342.19200300.100.1.53 NAME 'personalSignature' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) -attribute ( 0.9.2342.19200300.100.1.54 NAME 'dITRedirect' +attributetype ( 0.9.2342.19200300.100.1.54 NAME 'dITRedirect' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) # Netscape gives syntax 1.5 to this. We had it as 'bin'. -attribute ( 0.9.2342.19200300.100.1.55 NAME 'audio' +attributetype ( 0.9.2342.19200300.100.1.55 NAME 'audio' SYNTAX 1.3.6.1.4.1.1466.115.121.1.4 ) -attribute ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher' +attributetype ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) # From ietf-draft-smith-inetorgperson-xx.txt -attribute ( 0.9.2342.19200300.100.1.60 +attributetype ( 0.9.2342.19200300.100.1.60 NAME 'jpegPhoto' DESC 'a JPEG image' SYNTAX 1.3.6.1.4.1.1466.115.121.1.28 ) @@ -227,34 +227,34 @@ attribute ( 0.9.2342.19200300.100.1.60 # string in place of the missing OID. We will do the same until we # can make head or tails of this. -attribute ( abstract-oid NAME 'abstract' +attributetype ( abstract-oid NAME 'abstract' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( authorcn-oid NAME ( 'documentAuthorCommonName' 'authorCn' ) +attributetype ( authorcn-oid NAME ( 'documentAuthorCommonName' 'authorCn' ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( authorsn-oid NAME ( 'documentAuthorSurname' 'authorSn' ) +attributetype ( authorsn-oid NAME ( 'documentAuthorSurname' 'authorSn' ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( documentStore-oid NAME 'documentStore' +attributetype ( documentStore-oid NAME 'documentStore' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( keyWords-oid NAME 'keyWords' +attributetype ( keyWords-oid NAME 'keyWords' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( obsoletedByDocument-oid NAME 'obsoletedByDocument' +attributetype ( obsoletedByDocument-oid NAME 'obsoletedByDocument' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( obsoletesDocument-oid NAME 'obsoletesDocument' +attributetype ( obsoletesDocument-oid NAME 'obsoletesDocument' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( subject-oid NAME 'subject' +attributetype ( subject-oid NAME 'subject' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attribute ( updatedByDocument-oid NAME 'updatedByDocument' +attributetype ( updatedByDocument-oid NAME 'updatedByDocument' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) -attribute ( updatesDocument-oid NAME 'updatesDocument' +attributetype ( updatesDocument-oid NAME 'updatesDocument' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) # In classes, STRUCTURAL or AUXILIARY is chosen depending on the