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 1d30110108278d8bf3e78b6ad149233254415ed9..09df2d29d2862dcb2b48d2300b3c2c019cebcbea 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -3,16 +3,16 @@
 # 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 2587 (PKI)
 #      RFC 2589 (Dynamic Directory Services)
 #
-# select informational schema items:
+# Select informational schema items:
 #      RFC 2377 (uidObject)
 
 #
@@ -452,7 +452,7 @@ objectclass ( 2.5.6.20 NAME 'dmd'
 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'
@@ -526,14 +526,6 @@ 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'
-       EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-       SINGLE-VALUE )
-
 # RFC 2459
 attributetype ( 1.2.840.113549.1.9.1
        NAME ( 'email' 'emailAddress' 'pkcs9email' )