add domainComponent as alternative name for 'dc' (per rfc2253)

misc other clean up

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index d45664f2fbd2de41d809b9275c4de7db59e35b68..571fde98ff9be8deacfdb63803470b44f9a21bbb 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -525,22 +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 )
 
-#
-# RFC2247
-attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
-       DESC 'RFC2247 domain component'
+# RFC1274 + RFC2247
+attributetype ( 0.9.2342.19200300.100.1.25
+       NAME ( 'dc' 'domainComponent' )
+       DESC 'RFC1274/2247 domain component'
        EQUALITY caseIgnoreIA5Match
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
+# RFC2247
 objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
        SUP top AUXILIARY MUST dc )
 
-# RFC1274
+# Derived from RFC1274
 attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
        DESC 'RFC1274 user identifier'
-       EQUALITY caseIgnoreMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       SUP name )
 
 # RFC2377
 objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
@@ -558,19 +558,19 @@ attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref'
 
 objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
        DESC 'nameref referral object'
-       SUP top STRUCTURAL MAY ( ref ) )
+       SUP top STRUCTURAL MAY ref )
 
 #
 # LDAPsubEntry
 #      likely to change!
 objectclass ( 2.16.840.1.113719.2.142.6.1.1 NAME 'LDAPsubEntry'
        DESC 'LDAP Subentry'
-       SUP top STRUCTURAL MAY ( cn ) )
+       SUP top STRUCTURAL MAY cn )
 
 #
-# LDAProotDSE
+# OpenLDAProotDSE
 #      likely to change!
 objectclass ( 1.3.6.1.4.1.4203.666.3.2
        NAME ( 'OpenLDAProotDSE' 'LDAProotDSE' )
        DESC 'OpenLDAP Root DSE object'
-       SUP top STRUCTURAL )
+       SUP top STRUCTURAL MAY cn )