ITS#2607: improve socket() error logging with AF info

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

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index dc4a1a35e53367a14c8e7efd3f6868efa1fb6fbf..09df2d29d2862dcb2b48d2300b3c2c019cebcbea 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -3,23 +3,17 @@
 # OpenLDAP Core schema
 #
 # Includes LDAPv3 schema items from:
-#      RFC 2251-RFC2256 (LDAPv3)
+#      RFC 2252/2256 (LDAPv3)
 #
-# select standard track schema items:
-#      RFC 2587 (PKI)
-#      RFC 2079 (URI)
+# Select standard track schema items:
 #      RFC 1274 (uid/dc)
+#      RFC 2079 (URI)
 #      RFC 2247 (dc/dcObject)
-#      RFC 2289 (Dynamic Directory Services)
+#      RFC 2587 (PKI)
+#      RFC 2589 (Dynamic Directory Services)
 #
-# select informational schema items:
+# Select informational schema items:
 #      RFC 2377 (uidObject)
-#
-# select IETF ''work in progress'' LDAPext/LDUP items
-#   ldapSubentry
-#      ldapRootDSE
-#      named referrals
-#      alias draft
 
 #
 # Standard attribute types from RFC 2256
@@ -455,11 +449,10 @@ objectclass ( 2.5.6.20 NAME 'dmd'
 #
 # Object Classes from RFC 2587
 #
-
 objectclass ( 2.5.6.21 NAME 'pkiUser'
        DESC 'RFC2587: a PKI user'
        SUP top AUXILIARY
-       MUST userCertificate )
+       MAY userCertificate )
 
 objectclass ( 2.5.6.22 NAME 'pkiCA'
        DESC 'RFC2587: PKI certificate authority'
@@ -472,11 +465,9 @@ objectclass ( 2.5.6.23 NAME 'deltaCRL'
        SUP top AUXILIARY
        MAY deltaRevocationList )
 
-
 #
 # Standard Track URI label schema from RFC 2079
 #
-
 attributetype ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI'
        DESC 'RFC2079: Uniform Resource Identifier with optional label'
        EQUALITY caseExactMatch
@@ -487,14 +478,6 @@ objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
        MAY ( labeledURI )
        SUP top AUXILIARY )
 
-#
-# Standard Track Dynamic Directory Services from RFC 2589
-#
-
-objectclass ( 1.3.6.1.4.1.1466.101.119.2 NAME 'dynamicObject'
-       DESC 'RFC2589: Dynamic Object'
-       SUP top AUXILIARY )
-
 #
 # Derived from RFC 1274, but with new "short names"
 #
@@ -530,24 +513,12 @@ objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
        DESC 'RFC2247: domain component object'
        SUP top AUXILIARY MUST dc )
 
-
 # RFC 2377
 objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
        DESC 'RFC2377: uid object'
        SUP top AUXILIARY MUST uid )
 
-#
-# LDAPsubEntry
-#      deprecated!
-objectclass ( 2.16.840.1.113719.2.142.6.1.1
-       NAME 'LDAPsubEntry'
-       DESC 'LDAP Subentry'
-       OBSOLETE
-       SUP top STRUCTURAL MAY cn )
-
-#
 # From COSINE Pilot
-#
 attributetype ( 0.9.2342.19200300.100.1.37
        NAME 'associatedDomain'
        DESC 'RFC1274: domain associated with object'
@@ -555,12 +526,11 @@ attributetype ( 0.9.2342.19200300.100.1.37
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-#
-# From U-Mich
-#
-attributetype ( 1.3.6.1.4.1.250.1.32
-       NAME ( 'krbName' 'kerberosName' )
-       DESC 'Kerberos principal associated with object'
+# RFC 2459
+attributetype ( 1.2.840.113549.1.9.1
+       NAME ( 'email' 'emailAddress' 'pkcs9email' )
+       DESC 'RFC2459: legacy attribute for email addresses in DNs'
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-       SINGLE-VALUE )
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+