Commit eccc217c authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Add DESC and fix minor bugs, more changes to come

parent 4908dc5d
This diff is collapsed.
......@@ -20,7 +20,7 @@
# registration plate associated with an individual.
attributetype ( 2.16.840.1.113730.3.1.1
NAME 'carLicense'
DESC 'vehicle license or registration plate'
DESC 'RFC2798: vehicle license or registration plate'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
......@@ -30,7 +30,7 @@ attributetype ( 2.16.840.1.113730.3.1.1
# strictly numeric (e.g., 1234) or alphanumeric (e.g., ABC/123).
attributetype ( 2.16.840.1.113730.3.1.2
NAME 'departmentNumber'
DESC 'identifies a department within an organization'
DESC 'RFC2798: identifies a department within an organization'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
......@@ -42,7 +42,8 @@ attributetype ( 2.16.840.1.113730.3.1.2
# needed. Display name is defined for this purpose.
attributetype ( 2.16.840.1.113730.3.1.241
NAME 'displayName'
DESC 'preferred name of a person to be used when displaying entries'
DESC 'RFC2798: preferred name of a person to be used
when displaying entries'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
......@@ -53,7 +54,7 @@ attributetype ( 2.16.840.1.113730.3.1.241
# on order of hire or association with an organization. Single valued.
attributetype ( 2.16.840.1.113730.3.1.3
NAME 'employeeNumber'
DESC 'numerically identifies an employee within an organization'
DESC 'RFC2798: numerically identifies an employee within an organization'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
......@@ -65,7 +66,7 @@ attributetype ( 2.16.840.1.113730.3.1.3
# "Unknown" but any value may be used.
attributetype ( 2.16.840.1.113730.3.1.4
NAME 'employeeType'
DESC 'type of employment for a person'
DESC 'RFC2798: type of employment for a person'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
......@@ -80,7 +81,6 @@ 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 )
# preferredLanguage
# Used to indicate an individual's preferred written or spoken
......@@ -89,10 +89,9 @@ attributetype ( 0.9.2342.19200300.100.1.60
# the definition 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.
attributetype ( 2.16.840.1.113730.3.1.39
NAME 'preferredLanguage'
DESC 'preferred written or spoken language for a person'
DESC 'RFC2798: preferred written or spoken language for a person'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
......@@ -108,10 +107,9 @@ attributetype ( 2.16.840.1.113730.3.1.39
# this attribute are to be stored and requested in binary form, as
# 'userSMIMECertificate;binary'. If available, this attribute is
# preferred over the userCertificate attribute for S/MIME applications.
attributetype ( 2.16.840.1.113730.3.1.40
NAME 'userSMIMECertificate'
DESC 'PKCS#7 SignedData used to support S/MIME'
DESC 'RFC2798: PKCS#7 SignedData used to support S/MIME'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
# userPKCS12
......@@ -122,16 +120,18 @@ attributetype ( 2.16.840.1.113730.3.1.40
# values are PFX PDUs stored as binary data.
attributetype ( 2.16.840.1.113730.3.1.216
NAME 'userPKCS12'
DESC 'PKCS #12 PFX PDU for exchange of personal identity information'
DESC 'RFC2798: PKCS #12 PFX PDU for exchange of
personal identity information'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
# inetOrgPerson
# The inetOrgPerson represents people who are associated with an
# organization in some way. It is a structural class and is derived
# from the organizationalPerson class which is defined in X.521 [X521].
# from the organizationalPerson which is defined in X.521 [X521].
objectclass ( 2.16.840.1.113730.3.2.2
NAME 'inetOrgPerson'
DESC 'RFC2798: Internet Organizational Person'
SUP organizationalPerson
STRUCTURAL
MAY (
......@@ -141,5 +141,5 @@ objectclass ( 2.16.840.1.113730.3.2.2
labeledURI $ mail $ manager $ mobile $ o $ pager $
photo $ roomNumber $ secretary $ uid $ userCertificate $
x500uniqueIdentifier $ preferredLanguage $
userSMIMECertificate $ userPKCS12
) )
userSMIMECertificate $ userPKCS12 )
)
# $OpenLDAP$
#
# Assorted definitions from several sources
# depends on core.schema and pilot.schema
#
#
# draft-lachman-laser-ldap-mail-routing-01.txt
#
attributetype ( 2.16.840.1.113730.3.1.13
NAME 'mailLocalAddress'
DESC 'RFC 822 email address of this recipient'
DESC 'RFC822 email address of this recipient'
EQUALITY caseIgnoreIA5Match
SYNTAX '1.3.6.1.4.1.1466.115.121.1.26{256}' )
......@@ -23,13 +20,15 @@ attributetype ( 2.16.840.1.113730.3.1.18
attributetype ( 2.16.840.1.113730.3.1.47
NAME 'mailRoutingAddress'
DESC 'RFC 822 address to use when routing messages to
DESC 'RFC822 address to use when routing messages to
the SMTP MTA of this recipient'
EQUALITY caseIgnoreIA5Match
SYNTAX '1.3.6.1.4.1.1466.115.121.1.26{256}'
SINGLE-VALUE )
objectclass ( 2.16.840.1.113730.3.2.TBD NAME 'inetLocalMailRecipient'
objectclass ( 2.16.840.1.113730.3.2.TBD
NAME 'inetLocalMailRecipient'
DESC 'Internet local mail recipient'
SUP top AUXILIARY
MAY ( mailLocalAddress $ mailHost $ mailRoutingAddress )
......@@ -19,7 +19,7 @@ objectClass: ( 1.3.6.1.4.1.4203.666.3.4 NAME 'OpenLDAPperson'
MUST ( uid $ cn )
MAY ( authPassword $ givenName $ labeledURI $ o $ ou ) )
objectClass: ( 1.3.6.1.4.1.4203.666.3.5 NAME 'displayableObject'
DESC 'A Displayable Object'
objectClass: ( 1.3.6.1.4.1.4203.666.3.5 NAME 'OpenLDAPdisplayableObject'
DESC 'OpenLDAP Displayable Object'
MAY displayName AUXILIARY )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment