More clean up of system schema changes

servers/slapd/schema/README

-This directory contains schema definitions for use with slapd(5).
+This directory contains user application schema definitions for
+use with slapd(5).
 
 File                    Description
 ----                    -----------

servers/slapd/schema/collective.schema

@@ -17,48 +17,6 @@
 #  This document provides schema definitions for collective attributes
 #  for use in LDAP.
 
-#2.1. collectiveAttributes
-#
-#  Subentries of this object class are used to administer collective
-#  attributes and are referred to as collective attribute subentries.
-#
-objectClass ( 2.5.20.2 NAME 'collectiveAttributes' AUXILIARY )
-
-#  A collective attribute subentry SHOULD contain at least one collective
-#  attribute.  The collective attributes contained within a collective
-#  attribute subentry are available for finding, searching, and
-#  comparison at every entry within the scope of the subentry. The
-#  collective attributes, however, are administered (e.g. modified) via
-#  the subentry.
-#
-#
-#2.2. collectiveAttributeSubentry
-#
-#  The collectiveAttributeSubentry operational attribute identifies all
-#  collective attribute subentries that affect the entry.
-#
-#attributeType ( 2.5.18.12 NAME 'collectiveAttributeSubentry'
-#	EQUALITY distinguishedNameMatch
-#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-#	USAGE directoryOperation NO-USER-MODIFICATION )
-#
-#2.3. collectiveExclusions
-#
-#  The collectiveExclusions operational attribute allows particular
-#  collective attributes to be excluded from an entry.  It MAY appear in
-#  any entry and MAY have multiple values.
-#
-#attributeType ( 2.5.18.7 NAME 'collectiveExclusions'
-#	EQUALITY objectIdentifierMatch
-#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
-#	USAGE directoryOperation )
-#
-#  The name excludedAllCollectiveAttributes is associated with the OID
-#  2.5.18.0.  When this name or OID is present as a value of the
-#  collectiveExclusions attribute, all collective attributes are excluded
-#  from an entry.
-#
-#
 #3. Collective Attribute Types
 #
 #  A userApplications attribute type can be defined to be COLLECTIVE

servers/slapd/schema/core.schema

@@ -14,12 +14,6 @@
 #
 # 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,7 +449,6 @@ 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
@@ -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,9 +526,7 @@ 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'

servers/slapd/schema_prep.c

@@ -162,6 +162,12 @@ static struct slap_schema_oc_map {
 			"NAME 'collectiveAttributes' "
 			"AUXILIARY )", subentryObjectClass,
 		offsetof(struct slap_internal_schema, si_oc_collectiveAttributes) },
+	{ "dynamicObject", "( 1.3.6.1.4.1.1466.101.119.2 "
+			"NAME 'dynamicObject' "
+			"DESC 'RFC2589: Dynamic Object' "
+			"SUP top AUXILIARY )",
+		0,
+		offsetof(struct slap_internal_schema, si_oc_dynamicObject) },
 	{ NULL, 0 }
 };
 

servers/slapd/slap.h

@@ -515,6 +515,7 @@ struct slap_internal_schema {
 	ObjectClass *si_oc_subentry;
 	ObjectClass *si_oc_subschema;
 	ObjectClass *si_oc_collectiveAttributes;
+	ObjectClass *si_oc_dynamicObject;
 
 	/* objectClass attribute descriptions */
 	AttributeDescription *si_ad_objectClass;