From 04ca214dfb811597633c80294468eca04a0421e6 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 16 May 2000 22:25:36 +0000 Subject: [PATCH] Update inetOrgPerson based upon RFC 2978 --- servers/slapd/schema/inetorgperson.schema | 62 ++++++++++++++--------- servers/slapd/schema/pilot.schema | 2 +- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/servers/slapd/schema/inetorgperson.schema b/servers/slapd/schema/inetorgperson.schema index 80cb6384c9..9297d32d40 100644 --- a/servers/slapd/schema/inetorgperson.schema +++ b/servers/slapd/schema/inetorgperson.schema @@ -1,10 +1,19 @@ # $OpenLDAP$ # -# InetOrgPerson -# http://search.ietf.org/internet-drafts/draft-smith-ldap-inetorgperson-03.txt +# InetOrgPerson (RFC 2798) # -# depends on pilot.schema +# Depends upon +# The COSINE and Internet X.500 Schema [RFC1274] +# +# Definition of an X.500 Attribute Type and an Object Class to Hold +# Uniform Resource Identifiers (URIs) [RFC2079] +# (core.schema) +# +# A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256] +# (core.schema) # +# and X.500 pilot schema + # carLicense # This multivalued field is used to record the values of the license or @@ -65,12 +74,13 @@ attributetype ( 2.16.840.1.113730.3.1.4 # see pilot.schema # preferredLanguage -# Used to indicate an individual's preferred written or spoken language. -# This is useful for international correspondence or human-computer -# interaction. Values for this attribute type MUST conform to the defini- -# 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. +# Used to indicate an individual's preferred written or spoken +# language. This is useful for international correspondence or human- +# computer interaction. Values for this attribute type MUST conform to +# 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' @@ -80,15 +90,19 @@ attributetype ( 2.16.840.1.113730.3.1.39 SINGLE-VALUE ) # userSMIMECertificate -# An S/MIME [RFC1847] signed message with a zero-length body. This attri- -# bute is to be stored and requested in binary form, as -# 'userSMIMECertificate;binary'. It contains the person's entire certifi- -# cate chain and the signed attribute that describes their algorithm capa- -# bilities, stored as binary data. If available, this attribute is +# A PKCS#7 [RFC2315] SignedData, where the content that is signed is +# ignored by consumers of userSMIMECertificate values. It is +# recommended that values have a `contentType' of data with an absent +# `content' field. Values of this attribute contain a person's entire +# certificate chain and an smimeCapabilities field [RFC2633] that at a +# minimum describes their SMIME algorithm capabilities. Values for +# 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 'signed message used to support S/MIME' + DESC 'PKCS#7 SignedData used to support S/MIME' SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) # userPKCS12 @@ -104,19 +118,19 @@ attributetype ( 2.16.840.1.113730.3.1.216 # inetOrgPerson -# The inetOrgPerson represents people who are associated with an organiza- -# tion in some way. It is a structural class and is derived from the -# organizationalPerson class which is defined in X.521 [X521]. +# 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]. objectclass ( 2.16.840.1.113730.3.2.2 NAME 'inetOrgPerson' SUP organizationalPerson STRUCTURAL MAY ( audio $ businessCategory $ carLicense $ departmentNumber $ - displayName $ employeeNumber $ employeeType $ givenName $ homePhone $ - homePostalAddress $ initials $ jpegPhoto $ labeledURI $ - mail $ manager $ mobile $ o $ pager $ + displayName $ employeeNumber $ employeeType $ givenName $ + homePhone $ homePostalAddress $ initials $ jpegPhoto $ + labeledURI $ mail $ manager $ mobile $ o $ pager $ photo $ roomNumber $ secretary $ uid $ userCertificate $ - x500uniqueIdentifier $ preferredLanguage $ userSMIMECertificate $ - userPKCS12 ) - ) + x500uniqueIdentifier $ preferredLanguage $ + userSMIMECertificate $ userPKCS12 + ) ) diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema index c61bd75c6d..0feb3a6981 100644 --- a/servers/slapd/schema/pilot.schema +++ b/servers/slapd/schema/pilot.schema @@ -209,7 +209,7 @@ 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 +# From RFC 2798 (inetOrgPerson) attributetype ( 0.9.2342.19200300.100.1.60 NAME 'jpegPhoto' DESC 'a JPEG image'