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

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

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index 6ae5c593aee40348b44ac1554349348ac7bb2f5c..8ea7090ffce1af57dce39b36a71f97d40e9e4cba 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -1,4 +1,17 @@
+# RFC1274: Cosine and Internet X.500 schema
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2014 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>.
 #
 # RFC1274: Cosine and Internet X.500 schema
 #
@@ -229,7 +242,7 @@ attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo'
 #    ::= {pilotAttributeType 8}
 #
 attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass'
-       DESC 'RFC1274: categorory of user'
+       DESC 'RFC1274: category of user'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
@@ -360,8 +373,8 @@ attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation'
 #    ::= {pilotAttributeType 20}
 #
 attributetype ( 0.9.2342.19200300.100.1.20
-       DESC 'RFC1274: home telephone number'
        NAME ( 'homePhone' 'homeTelephoneNumber' )
+       DESC 'RFC1274: home telephone number'
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
@@ -408,12 +421,12 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
 #            uTCTimeSyntax
 #    ::= {pilotAttributeType 23}
 #
-## OBSOLETE
-attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
-       DESC 'RFC1274: time of last modify, replaced by modifyTimestamp'
-       OBSOLETE
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.53
-       USAGE directoryOperation )
+## Deprecated in favor of modifyTimeStamp
+#attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
+#      DESC 'RFC1274: time of last modify, replaced by modifyTimestamp'
+#      OBSOLETE
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.53
+#      USAGE directoryOperation )
 
 # 9.3.20.  Last Modified By
 #
@@ -426,14 +439,13 @@ attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
 #            distinguishedNameSyntax
 #    ::= {pilotAttributeType 24}
 #
-
-## OBSOLETE
-attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
-       DESC 'RFC1274: last modifier, replaced by modifiersName'
-       OBSOLETE
-       EQUALITY distinguishedNameMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-       USAGE directoryOperation )
+## Deprecated in favor of modifiersName
+#attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
+#      DESC 'RFC1274: last modifier, replaced by modifiersName'
+#      OBSOLETE
+#      EQUALITY distinguishedNameMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+#      USAGE directoryOperation )
 
 # 9.3.21.  Domain Component
 #
@@ -1022,12 +1034,12 @@ attributetype ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher'
 #            audio}
 #    ::= {pilotObjectClass 3}
 #
-objectclass ( 0.9.2342.19200300.100.4.3 NAME 'pilotObject'
-       DESC 'RFC1274: pilot object'
-       SUP top AUXILIARY
-       MAY ( info $ photo $ manager $ uniqueIdentifier $
-               lastModifiedTime $ lastModifiedBy $ dITRedirect $ audio )
-       )
+#objectclass ( 0.9.2342.19200300.100.4.3 NAME 'pilotObject'
+#      DESC 'RFC1274: pilot object'
+#      SUP top AUXILIARY
+#      MAY ( info $ photo $ manager $ uniqueIdentifier $
+#              lastModifiedTime $ lastModifiedBy $ dITRedirect $ audio )
+#      )
 
 # 8.3.2.  Pilot Person
 #
@@ -1257,7 +1269,7 @@ objectclass ( 0.9.2342.19200300.100.4.14 NAME 'RFC822localPart'
 #    ::= {pilotObjectClass 15}
 #
 objectclass ( 0.9.2342.19200300.100.4.15 NAME 'dNSDomain'
-       SUP 'domain' STRUCTURAL
+       SUP domain STRUCTURAL
        MAY ( ARecord $ MDRecord $ MXRecord $ NSRecord $
                SOARecord $ CNAMERecord )
        )