Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / schema / inetorgperson.schema

diff --git a/servers/slapd/schema/inetorgperson.schema b/servers/slapd/schema/inetorgperson.schema
index 2589c3602919d7b5f6ae52dee33cd3d28eaa7caf..597287d54ebc79c1a2c79c1185719dd0070d47b7 100644 (file)
--- a/servers/slapd/schema/inetorgperson.schema
+++ b/servers/slapd/schema/inetorgperson.schema
@@ -1,19 +1,29 @@
+# inetorgperson.schema -- InetOrgPerson (RFC2798)
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2012 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 #
-# InetOrgPerson (RFC 2798)
+# InetOrgPerson (RFC2798)
 #
 # 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
-   
+#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
 
 # carLicense
 # This multivalued field is used to record the values of the license or
@@ -42,8 +52,7 @@ 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 'RFC2798: preferred name of a person to be used 
-               when displaying entries'
+       DESC 'RFC2798: preferred name to be used when displaying entries'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -76,10 +85,10 @@ attributetype ( 2.16.840.1.113730.3.1.4
 # Interchange Format [JFIF].
 # Note that the jpegPhoto attribute type was defined for use in the
 # Internet X.500 pilots but no referencable definition for it could be
-# located.    
+# located.
 attributetype ( 0.9.2342.19200300.100.1.60
        NAME 'jpegPhoto'
-       DESC 'a JPEG image'
+       DESC 'RFC2798: a JPEG image'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.28 )
 
 # preferredLanguage
@@ -107,6 +116,7 @@ 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.
+## OpenLDAP note: ";binary" transfer should NOT be used as syntax is binary
 attributetype ( 2.16.840.1.113730.3.1.40
        NAME 'userSMIMECertificate'
        DESC 'RFC2798: PKCS#7 SignedData used to support S/MIME'
@@ -118,10 +128,10 @@ attributetype ( 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.
+## OpenLDAP note: ";binary" transfer should NOT be used as syntax is binary
 attributetype ( 2.16.840.1.113730.3.1.216
        NAME 'userPKCS12'
-       DESC 'RFC2798: PKCS #12 PFX PDU for exchange of 
-               personal identity information'
+       DESC 'RFC2798: personal identity information, a PKCS #12 PFX'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
 
 
@@ -142,4 +152,4 @@ objectclass ( 2.16.840.1.113730.3.2.2
                photo $ roomNumber $ secretary $ uid $ userCertificate $
                x500uniqueIdentifier $ preferredLanguage $
                userSMIMECertificate $ userPKCS12 )
-       )  
+       )