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 237347cd32e86994edcae54556f1d70a384bdfc1..597287d54ebc79c1a2c79c1185719dd0070d47b7 100644 (file)
--- a/servers/slapd/schema/inetorgperson.schema
+++ b/servers/slapd/schema/inetorgperson.schema
@@ -1,4 +1,17 @@
+# 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 (RFC2798)
 #
@@ -6,12 +19,12 @@
 #   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)
 #
 #   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
-   
+
 # carLicense
 # This multivalued field is used to record the values of the license or
 # registration plate associated with an individual.
@@ -72,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 'RFC2798: jpegPhoto'
-       DESC 'a JPEG image'
+       NAME 'jpegPhoto'
+       DESC 'RFC2798: a JPEG image'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.28 )
 
 # preferredLanguage
@@ -139,4 +152,4 @@ objectclass ( 2.16.840.1.113730.3.2.2
                photo $ roomNumber $ secretary $ uid $ userCertificate $
                x500uniqueIdentifier $ preferredLanguage $
                userSMIMECertificate $ userPKCS12 )
-       )  
+       )