move mail and simpleSecurityObject to core.schema

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 571fde98ff9be8deacfdb63803470b44f9a21bbb..d594a34642af5118351daec2409886ed6b03d0db 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -7,7 +7,7 @@
 #
 # select standard track schema items:
 #      RFC2079 (URI)
-#      RFC1274 (uid)
+#      RFC1274 (uid/dc)
 #      RFC2247 (dc/dcObject)
 #      RFC2289 (Dynamic Directory Services)
 #
@@ -525,6 +525,22 @@ 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 )
 
+# Derived from RFC1274
+attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
+       DESC 'RFC1274 user identifier'
+       SUP name )
+
+attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
+       DESC 'rfc822 mail box'
+    EQUALITY caseIgnoreIA5Match
+    SUBSTR caseIgnoreIA5SubstringsMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
+objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
+       SUP top AUXILIARY
+       MUST userPassword )
+
+
 # RFC1274 + RFC2247
 attributetype ( 0.9.2342.19200300.100.1.25
        NAME ( 'dc' 'domainComponent' )
@@ -537,12 +553,8 @@ attributetype ( 0.9.2342.19200300.100.1.25
 objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
        SUP top AUXILIARY MUST dc )
 
-# Derived from RFC1274
-attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
-       DESC 'RFC1274 user identifier'
-       SUP name )
 
-# RFC2377
+# From RFC2377
 objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
        DESC 'RFC2377 uid object'
        SUP top AUXILIARY MUST uid )

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index 552a673f80add1e83c804f0147eda845efca5081..03d1ab9e7f4131c52605aeda6b718052834e7e7f 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -129,11 +129,11 @@ attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
 #            (SIZE (1 .. ub-rfc822-mailbox))
 #    ::= {pilotAttributeType 3}
 #
-#(in inetorgperson.schema)
-attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
-       EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+#(in core.schema)
+##attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
+##     EQUALITY caseIgnoreIA5Match
+##     SUBSTR caseIgnoreIA5SubstringsMatch
+##     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # 9.3.4.  Information
 #
@@ -1261,9 +1261,10 @@ objectclass ( 0.9.2342.19200300.100.4.18 NAME 'friendlyCountry'
 #            userPassword }
 #    ::= {pilotObjectClass 19}
 #
-objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
-       SUP top AUXILIARY
-       MUST userPassword )
+## (in core.schema)
+## objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
+##     SUP top AUXILIARY
+##     MUST userPassword )
 
 # 8.3.13.  Pilot Organization
 #