ITS#4587: selfwrite access is broken

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

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 9a23e7b255ed6ba35d0f903402a17e92d9816312..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-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -121,11 +121,12 @@ 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} )
 
 # Deprecated by enhancedSearchGuide
 attributetype ( 2.5.4.14 NAME 'searchGuide'
@@ -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'
@@ -270,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
@@ -309,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 )
@@ -345,6 +347,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 +530,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"