More unifdef SLAPD_MULTIMASTER cleanup

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

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 199e5c72c539ea27fa962d85b8cc58ba2d160056..4551f7a095e618a88ee259936340be921c39af34 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -121,15 +121,16 @@ attributetype ( 2.5.4.12 NAME 'title'
        DESC 'RFC2256: title associated with the entity'
        SUP name )
 
-attributetype ( 2.5.4.13 NAME 'description'
-       DESC 'RFC2256: descriptive information'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
+# system schema
+#attributetype ( 2.5.4.13 NAME 'description'
+#      DESC 'RFC2256: descriptive information'
+#      EQUALITY caseIgnoreMatch
+#      SUBSTR caseIgnoreSubstringsMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
-# Obsoleted by enhancedSearchGuide
+# Deprecated by enhancedSearchGuide
 attributetype ( 2.5.4.14 NAME 'searchGuide'
-       DESC 'RFC2256: search guide, obsoleted by enhancedSearchGuide'
+       DESC 'RFC2256: search guide, deprecated by enhancedSearchGuide'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
 
 attributetype ( 2.5.4.15 NAME 'businessCategory'
@@ -231,9 +232,10 @@ attributetype ( 2.5.4.33 NAME 'roleOccupant'
        DESC 'RFC2256: occupant of role'
        SUP distinguishedName )
 
-attributetype ( 2.5.4.34 NAME 'seeAlso'
-       DESC 'RFC2256: DN of related object'
-       SUP distinguishedName )
+# system schema
+#attributetype ( 2.5.4.34 NAME 'seeAlso'
+#      DESC 'RFC2256: DN of related object'
+#      SUP distinguishedName )
 
 # system schema
 #attributetype ( 2.5.4.35 NAME 'userPassword'
@@ -248,10 +250,6 @@ attributetype ( 2.5.4.36 NAME 'userCertificate'
        EQUALITY certificateExactMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
-attributetype ( 1.3.6.1.4.1.4203.666.1.34 NAME 'componentCertificate'
-        DESC 'RFC 3687 Component Matching, use ;binary'
-        SYNTAX 1.3.6.1.4.1.4203.666.2.7 )
-
 # Must be transferred using ;binary
 # with certificateExactMatch rule (per X.509)
 attributetype ( 2.5.4.37 NAME 'cACertificate'
@@ -274,7 +272,7 @@ attributetype ( 2.5.4.40 NAME 'crossCertificatePair'
        DESC 'RFC2256: X.509 cross certificate pair, use ;binary'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.10 )
 
-# 2.5.4.41 is defined above as it's used for subtyping
+# system schema
 #attributetype ( 2.5.4.41 NAME 'name'
 #      EQUALITY caseIgnoreMatch
 #      SUBSTR caseIgnoreSubstringsMatch
@@ -313,7 +311,7 @@ attributetype ( 2.5.4.48 NAME 'protocolInformation'
        EQUALITY protocolInformationMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
 
-# 2.5.4.49 is defined above as it's used for subtyping
+# system schema
 #attributetype ( 2.5.4.49 NAME 'distinguishedName'
 #      EQUALITY distinguishedNameMatch
 #      SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
@@ -343,9 +341,18 @@ attributetype ( 2.5.4.54 NAME 'dmdName'
        DESC 'RFC2256: name of DMD'
        SUP name )
 
+attributetype ( 2.5.4.65 NAME 'pseudonym'
+       DESC 'X.520(4th): pseudonym for the object'
+       SUP name )
 
 # Standard object classes from RFC2256
 
+# system schema
+#objectclass ( 2.5.6.0 NAME 'top'
+#      DESC 'RFC2256: top of the superclass chain'
+#      ABSTRACT
+#      MUST objectClass )
+
 # system schema
 #objectclass ( 2.5.6.1 NAME 'alias'
 #      DESC 'RFC2256: an alias'
@@ -396,7 +403,7 @@ objectclass ( 2.5.6.7 NAME 'organizationalPerson'
        SUP person STRUCTURAL
        MAY ( title $ x121Address $ registeredAddress $ destinationIndicator $
                preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
-               telephoneNumber $ internationaliSDNNumber $ componentCertificate $
+               telephoneNumber $ internationaliSDNNumber $ 
                facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
                postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) )
 
@@ -523,18 +530,18 @@ objectclass ( 2.5.6.23 NAME 'deltaCRL'
 
 objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
        DESC 'RFC2079: object that contains the URI attribute type'
-       MAY ( labeledURI )
-       SUP top AUXILIARY )
+       SUP top AUXILIARY
+       MAY ( labeledURI ) )
 
 #
 # Derived from RFC 1274, but with new "short names"
 #
-attributetype ( 0.9.2342.19200300.100.1.1
-       NAME ( 'uid' 'userid' )
-       DESC 'RFC1274: user identifier'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
+#attributetype ( 0.9.2342.19200300.100.1.1
+#      NAME ( 'uid' 'userid' )
+#      DESC 'RFC1274: user identifier'
+#      EQUALITY caseIgnoreMatch
+#      SUBSTR caseIgnoreSubstringsMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
 attributetype ( 0.9.2342.19200300.100.1.3
        NAME ( 'mail' 'rfc822Mailbox' )
@@ -577,7 +584,7 @@ attributetype ( 0.9.2342.19200300.100.1.37
 # RFC 2459 -- deprecated in favor of 'mail' (in cosine.schema)
 attributetype ( 1.2.840.113549.1.9.1
        NAME ( 'email' 'emailAddress' 'pkcs9email' )
-       DESC 'RFC2459: legacy attribute for email addresses in DNs'
+       DESC 'RFC3280: legacy attribute for email addresses in DNs'
        EQUALITY caseIgnoreIA5Match
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )