Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

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

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 62527e25f59d7a863a0c1d0121c482c2acadb663..4acf6593b11aa9fd3f86edfdb73541f7b9b13f87 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-2005 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 #
-## Portions Copyright (C) The Internet Society (1997-2003).
+## Portions Copyright (C) The Internet Society (1997-2006).
 ## All Rights Reserved.
 ##
 ## This document and translations of it may be copied and furnished to
@@ -51,6 +51,7 @@
 #      RFC 2247 (dc/dcObject)
 #      RFC 2587 (PKI)
 #      RFC 2589 (Dynamic Directory Services)
+#      RFC 4524 (associatedDomain)
 #
 # Select informational schema items:
 #      RFC 2377 (uidObject)
@@ -91,9 +92,16 @@ attributetype ( 2.5.4.5 NAME 'serialNumber'
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} )
 
+# RFC 4519 definition ('countryName' in X.500 and RFC2256)
 attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
-       DESC 'RFC2256: ISO-3166 country 2-letter code'
-       SUP name SINGLE-VALUE )
+       DESC 'RFC4519: two-letter ISO-3166 country code'
+       SUP name
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.11
+       SINGLE-VALUE )
+
+#attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
+#      DESC 'RFC2256: ISO-3166 country 2-letter code'
+#      SUP name SINGLE-VALUE )
 
 attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' )
        DESC 'RFC2256: locality which this object resides in'
@@ -121,15 +129,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 +240,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'
@@ -270,7 +280,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
@@ -309,7 +319,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 )
@@ -345,6 +355,12 @@ attributetype ( 2.5.4.65 NAME 'pseudonym'
 
 # 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'
@@ -522,8 +538,8 @@ 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"
@@ -565,7 +581,18 @@ objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
        DESC 'RFC2377: uid object'
        SUP top AUXILIARY MUST uid )
 
-# From COSINE Pilot
+# RFC 4524
+#   The 'associatedDomain' attribute specifies DNS [RFC1034][RFC2181]
+#   host names [RFC1123] that are associated with an object.   That is,
+#   values of this attribute should conform to the following ABNF:
+#
+#    domain = root / label *( DOT label )
+#    root   = SPACE
+#    label  = LETDIG [ *61( LETDIG / HYPHEN ) LETDIG ]
+#    LETDIG = %x30-39 / %x41-5A / %x61-7A ; "0" - "9" / "A"-"Z" / "a"-"z"
+#    SPACE  = %x20                        ; space (" ")
+#    HYPHEN = %x2D                        ; hyphen ("-")
+#    DOT    = %x2E                        ; period (".")
 attributetype ( 0.9.2342.19200300.100.1.37
        NAME 'associatedDomain'
        DESC 'RFC1274: domain associated with object'
@@ -576,7 +603,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} )