Schema cleanup

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index a06aefa5d64df32032edf7b012ebca98ac8f69cb..f8671b2d6f5b51ad354f6570fb4b2d601733ebba 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -524,8 +524,8 @@ objectclass ( 2.5.6.23 NAME 'deltaCRL'
 
 objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
        DESC 'RFC2079: object that contains the URI attribute type'
-       MAY ( labeledURI )
-       SUP top AUXILIARY )
+       SUP top AUXILIARY
+       MAY ( labeledURI ) )
 
 #
 # Derived from RFC 1274, but with new "short names"

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index d97a5c1b8708e5548fae2678302f46140f8bbcb0..b89e79f0186424869cc0889317023a2278814430 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -373,8 +373,8 @@ attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation'
 #    ::= {pilotAttributeType 20}
 #
 attributetype ( 0.9.2342.19200300.100.1.20
-       DESC 'RFC1274: home telephone number'
        NAME ( 'homePhone' 'homeTelephoneNumber' )
+       DESC 'RFC1274: home telephone number'
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )

diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema
index 0f07b9621339d969c658e12775a77f44fae13f29..d2c3798b419beadfdb208f15e112bad41e150e03 100644 (file)
--- a/servers/slapd/schema/nis.schema
+++ b/servers/slapd/schema/nis.schema
@@ -156,67 +156,80 @@ attributetype ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry'
 
 # Object Class Definitions
 
-objectclass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount' SUP top AUXILIARY
+objectclass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount'
        DESC 'Abstraction of an account with POSIX attributes'
+       SUP top AUXILIARY
        MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory )
        MAY ( userPassword $ loginShell $ gecos $ description ) )
 
-objectclass ( 1.3.6.1.1.1.2.1 NAME 'shadowAccount' SUP top AUXILIARY
+objectclass ( 1.3.6.1.1.1.2.1 NAME 'shadowAccount'
        DESC 'Additional attributes for shadow passwords'
+       SUP top AUXILIARY
        MUST uid
        MAY ( userPassword $ shadowLastChange $ shadowMin $
              shadowMax $ shadowWarning $ shadowInactive $
              shadowExpire $ shadowFlag $ description ) )
 
-objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup'
        DESC 'Abstraction of a group of accounts'
+       SUP top AUXILIARY
        MUST ( cn $ gidNumber )
        MAY ( userPassword $ memberUid $ description ) )
 
-objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService'
        DESC 'Abstraction an Internet Protocol service'
+       SUP top STRUCTURAL
        MUST ( cn $ ipServicePort $ ipServiceProtocol )
        MAY ( description ) )
 
-objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol'
        DESC 'Abstraction of an IP protocol'
+       SUP top STRUCTURAL
        MUST ( cn $ ipProtocolNumber $ description )
        MAY description )
 
-objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc'
        DESC 'Abstraction of an ONC/RPC binding'
+       SUP top STRUCTURAL
        MUST ( cn $ oncRpcNumber $ description )
        MAY description )
 
-objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost' SUP top AUXILIARY
+objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost'
        DESC 'Abstraction of a host, an IP device'
+       SUP top AUXILIARY
        MUST ( cn $ ipHostNumber )
        MAY ( l $ description $ manager ) )
 
-objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork'
        DESC 'Abstraction of an IP network'
+       SUP top STRUCTURAL
        MUST ( cn $ ipNetworkNumber )
        MAY ( ipNetmaskNumber $ l $ description $ manager ) )
 
-objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup'
        DESC 'Abstraction of a netgroup'
+       SUP top STRUCTURAL
        MUST cn
        MAY ( nisNetgroupTriple $ memberNisNetgroup $ description ) )
 
-objectclass ( 1.3.6.1.1.1.2.9 NAME 'nisMap' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.9 NAME 'nisMap'
        DESC 'A generic abstraction of a NIS map'
+       SUP top STRUCTURAL
        MUST nisMapName
        MAY description )
 
-objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject'
        DESC 'An entry in a NIS map'
+       SUP top STRUCTURAL
        MUST ( cn $ nisMapEntry $ nisMapName )
        MAY description )
 
-objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device' SUP top AUXILIARY
+objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device'
        DESC 'A device with a MAC address'
+       SUP top AUXILIARY
        MAY macAddress )
 
-objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice' SUP top AUXILIARY
+objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice'
        DESC 'A device with boot parameters'
+       SUP top AUXILIARY
        MAY ( bootFile $ bootParameter ) )