add 'objectIdentifier' to openldap.schema ONLY

(other schema should be provided as defined in its specification).
and trim DESC to one line

diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema
index a2f35a724092ad7dd81ea2e069e4bf80cf3889c6..61c53c0cff04ba6bdf60794d3e978df7a63ebf56 100644 (file)
--- a/servers/slapd/schema/nis.schema
+++ b/servers/slapd/schema/nis.schema
@@ -105,22 +105,22 @@ attributetype ( 1.3.6.1.1.1.1.18 NAME 'oncRpcNumber'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.1.1.1.19 NAME 'ipHostNumber'
-       DESC 'IP address as a dotted decimal, eg. 192.168.1.1, omitting leading zeros'
+       DESC 'IP address'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
 
 attributetype ( 1.3.6.1.1.1.1.20 NAME 'ipNetworkNumber'
-       DESC 'IP network as a dotted decimal, eg. 192.168, omitting leading zeros'
+       DESC 'IP network'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.1.1.1.21 NAME 'ipNetmaskNumber'
-       DESC 'IP netmask as a dotted decimal, eg. 255.255.255.0, omitting leading zeros'
+       DESC 'IP netmask'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.1.1.1.22 NAME 'macAddress'
-       DESC 'MAC address in maximal, colon separated hex notation, eg. 00:00:92:90:ee:e2'
+       DESC 'MAC address'
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
 
@@ -161,45 +161,32 @@ objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup' SUP top STRUCTURAL
        MAY ( userPassword $ memberUid $ description ) )
 
 objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService' SUP top STRUCTURAL
-       DESC 'Abstraction an Internet Protocol service.
-             Maps an IP port and protocol (such as tcp or udp)
-             to one or more names; the distinguished value of
-             the cn attribute denotes the service"s canonical
-             name'
+       DESC 'Abstraction an Internet Protocol service'
        MUST ( cn $ ipServicePort $ ipServiceProtocol )
        MAY ( description ) )
 
 objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol' SUP top STRUCTURAL
-       DESC 'Abstraction of an IP protocol. Maps a protocol number
-             to one or more names. The distinguished value of the cn
-             attribute denotes the protocol"s canonical name'
+       DESC 'Abstraction of an IP protocol'
        MUST ( cn $ ipProtocolNumber $ description )
        MAY description )
 
 objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc' SUP top STRUCTURAL
-       DESC 'Abstraction of an Open Network Computing (ONC)
-             [RFC1057] Remote Procedure Call (RPC) binding.
-             This class maps an ONC RPC number to a name.
-             The distinguished value of the cn attribute denotes
-             the RPC service"s canonical name'
+       DESC 'Abstraction of an ONC/RPC binding'
        MUST ( cn $ oncRpcNumber $ description )
        MAY description )
 
 objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost' SUP top AUXILIARY
-       DESC 'Abstraction of a host, an IP device. The distinguished
-             value of the cn attribute denotes the host"s canonical
-             name. Device SHOULD be used as a structural class'
+       DESC 'Abstraction of a host, an IP device'
        MUST ( cn $ ipHostNumber )
        MAY ( l $ description $ manager ) )
 
 objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork' SUP top STRUCTURAL
-       DESC 'Abstraction of a network. The distinguished value of
-             the cn attribute denotes the network"s canonical name'
+       DESC 'Abstraction of an IP network'
        MUST ( cn $ ipNetworkNumber )
        MAY ( ipNetmaskNumber $ l $ description $ manager ) )
 
 objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup' SUP top STRUCTURAL
-       DESC 'Abstraction of a netgroup. May refer to other netgroups'
+       DESC 'Abstraction of a netgroup'
        MUST cn
        MAY ( nisNetgroupTriple $ memberNisNetgroup $ description ) )
 
@@ -214,11 +201,9 @@ objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject' SUP top STRUCTURAL
        MAY description )
 
 objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device' SUP top AUXILIARY
-       DESC 'A device with a MAC address; device SHOULD be
-             used as a structural class'
+       DESC 'A device with a MAC address'
        MAY macAddress )
 
 objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice' SUP top AUXILIARY
-       DESC 'A device with boot parameters; device SHOULD be
-             used as a structural class'
+       DESC 'A device with boot parameters'
        MAY ( bootFile $ bootParameter ) )

diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index ead55a7c5a52c210931b98b8d195b8deea009fb6..bfb638b332be4103cd08a4f28f21e0b2c2c61c71 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -9,23 +9,32 @@
 #
 # These are provided for informational purposes only.
 
-objectClass ( 1.3.6.1.4.1.4203.1.4.3 NAME 'OpenLDAPorg'
+objectIdentifier OpenLDAProot 1.3.6.1.4.1.4203
+
+objectIdentifier OpenLDAP OpenLDAProot:1
+objectIdentifier OpenLDAPattributeType OpenLDAP:3
+objectIdentifier OpenLDAPobjectClass OpenLDAP:4
+
+objectClass ( OpenLDAPobjectClass:3
+       NAME 'OpenLDAPorg'
        DESC 'OpenLDAP Organizational Object'
        SUP organization
        MAY ( buildingName $ displayName $ labeledURI ) )
 
-objectClass ( 1.3.6.1.4.1.4203.1.4.4 NAME 'OpenLDAPou'
+objectClass ( OpenLDAPobjectClass:4
+       NAME 'OpenLDAPou'
        DESC 'OpenLDAP Organizational Unit Object'
        SUP organizationalUnit
        MAY ( buildingName $ displayName $ labeledURI $ o ) )
 
-objectClass ( 1.3.6.1.4.1.4203.1.4.5 NAME 'OpenLDAPperson'
+objectClass ( OpenLDAPobjectClass:5
+       NAME 'OpenLDAPperson'
        DESC 'OpenLDAP Person'
        SUP ( pilotPerson $ inetOrgPerson )
        MUST ( uid $ cn )
        MAY ( givenName $ labeledURI $ o ) )
 
-objectClass ( 1.3.6.1.4.1.4203.1.4.6 NAME 'OpenLDAPdisplayableObject'
+objectClass ( OpenLDAPobjectClass:6
+       NAME 'OpenLDAPdisplayableObject'
        DESC 'OpenLDAP Displayable Object'
        MAY displayName AUXILIARY )
-