Shift a few more "core" items from pilot to core.

servers/slapd/schema/core.schema

@@ -2,15 +2,24 @@
 #
 # OpenLDAP Core schema
 #
-# Includes "standard" schema items from:
+# Includes LDAPv3 schema items from:
 #	RFC2251-RFC2256 (LDAPv3)
+#
+# select standard track schema items:
 #	RFC2079 (URI)
+#	RFC1274 (uid)
+#	RFC2247 (dc/dcObject)
+#	RFC2289 (Dynamic Directory Services)
+#
+# select informational schema items:
+#	RFC2377 (uidObject)
 #
-# and other "core" items
-#   ldapsubentry draft
+# select experimental IETF LDAPext items
+#   ldapSubentry draft
+#	ldapRootDSE
 #	named referrals draft
 #	alias draft
-#
+
 
 # Standard X.501(93) Operational Attribute Types from RFC2252
 
@@ -481,13 +490,22 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees'
 
 #
 # RFC2247
-#	This may need to be moved to core.schema
-objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject' SUP top AUXILIARY MUST dc )
+attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
+	SUP top AUXILIARY MUST dc )
+
+# RFC1274
+attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-#
 # RFC2377
-#	This may need to be moved to core.schema
-objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' SUP top AUXILIARY MUST uid )
+objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
+	SUP top AUXILIARY MUST uid )
 
 #
 # From draft-ietf-ldapext-nameref-00.txt

servers/slapd/schema/pilot.schema

@@ -21,10 +21,6 @@
 
 # Believe it or not, this is case-insensitive
 
-attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
-	EQUALITY caseIgnoreMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
 attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
@@ -106,13 +102,10 @@ attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
 # This is the definition as defined in RFC2247
 # Terrific, we don't know about caseIgnoreIA5SubstringsMatch
 
-#attribute ( 0.9.2342.19200300.100.1.25 NAME 'dc'
+# See RFC2247 define in core.schema
+#attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
 #	EQUALITY caseIgnoreIA5Match
-#	SUBSTR caseIgnoreIA5SubstringsMatch
 #	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # This is aRecord in RFC1274.  However, objectclass dNSDomain as we
 # and Netscape use it is very different.
@@ -317,7 +310,6 @@ objectclass ( 0.9.2342.19200300.100.4.9 NAME 'documentSeries' SUP top
 	l $ o $ ou ) )
 
 # This definition is much longer than that in RFC1274 and is taken from RFC2247
-
 objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain' SUP top STRUCTURAL
      MUST dc
      MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $