Move dcObject uidObject to core.schema

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 4903bc7ce6971a970a14b9e1e4ba08d282e270d9..1ec8492b35bd4b4443efc85030e464f1c3ad4e9a 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -479,6 +479,16 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION
        USAGE dSAOperation )
 
+#
+# 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 )
+
+#
+# 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 )
+
 #
 # From draft-ietf-ldapext-nameref-00.txt
 #      used to represent referrals in the directory

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 42e1757f8ac51ec097959d380279bc06bbb2f0c9..5ac51be9f876e0cff7007db72077009a645a1a7b 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -34,14 +34,3 @@ objectclass ( 2.16.840.1.113730.3.2.3 NAME 'mailRecipient'
 #      MAY     ( mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress )
 
 
-#
-# 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 )
-
-
-#
-# 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 )
-