Misc. schema updates.

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 3e1f5fdaa860a14c965a7cb11ca2b5d96fa94d46..d45664f2fbd2de41d809b9275c4de7db59e35b68 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -121,20 +121,24 @@ objectclass ( 2.5.20.1 NAME 'subschema' AUXILIARY
 
 # Standard attribute types from RFC2256
 
-attributetype ( 2.5.4.0 NAME 'objectClass' EQUALITY objectIdentifierMatch
+attributetype ( 2.5.4.0 NAME 'objectClass'
+      EQUALITY objectIdentifierMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
 
-attributetype ( 2.5.4.1 NAME 'aliasedObjectName' EQUALITY distinguishedNameMatch
+attributetype ( 2.5.4.1 NAME 'aliasedObjectName'
+      EQUALITY distinguishedNameMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
 
 # Defined, but no longer used
 
-attributetype ( 2.5.4.2 NAME 'knowledgeInformation' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.2 NAME 'knowledgeInformation'
+      EQUALITY caseIgnoreMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
 # Place here since other attribute types derive from it
 
-attributetype ( 2.5.4.41 NAME 'name' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.41 NAME 'name'
+      EQUALITY caseIgnoreMatch
       SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
@@ -154,7 +158,8 @@ attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' ) SUP name )
 
 attributetype ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' ) SUP name )
 
-attributetype ( 2.5.4.9 NAME ( 'street' 'streetAddress' ) EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.9 NAME ( 'street' 'streetAddress' )
+      EQUALITY caseIgnoreMatch
       SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
@@ -164,7 +169,8 @@ attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' ) SUP name )
 
 attributetype ( 2.5.4.12 NAME 'title' SUP name )
 
-attributetype ( 2.5.4.13 NAME 'description' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.13 NAME 'description'
+      EQUALITY caseIgnoreMatch
       SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
@@ -173,30 +179,33 @@ attributetype ( 2.5.4.13 NAME 'description' EQUALITY caseIgnoreMatch
 attributetype ( 2.5.4.14 NAME 'searchGuide'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
 
-attributetype ( 2.5.4.15 NAME 'businessCategory' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.15 NAME 'businessCategory'
+     EQUALITY caseIgnoreMatch
      SUBSTR caseIgnoreSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
-# Show stopper: we don't have the definition of caseIgnoreListSubstringsMatch
-#attribute ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch
-#     SUBSTR caseIgnoreListSubstringsMatch
-#     SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-attributetype ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch
+attribute ( 2.5.4.16 NAME 'postalAddress'
+     EQUALITY caseIgnoreListMatch
+     SUBSTR caseIgnoreListSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
 
-attributetype ( 2.5.4.17 NAME 'postalCode' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.17 NAME 'postalCode'
+     EQUALITY caseIgnoreMatch
      SUBSTR caseIgnoreSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
 
-attributetype ( 2.5.4.18 NAME 'postOfficeBox' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.18 NAME 'postOfficeBox'
+     EQUALITY caseIgnoreMatch
      SUBSTR caseIgnoreSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
 
-attributetype ( 2.5.4.19 NAME 'physicalDeliveryOfficeName' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.19 NAME 'physicalDeliveryOfficeName'
+     EQUALITY caseIgnoreMatch
      SUBSTR caseIgnoreSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
-attributetype ( 2.5.4.20 NAME 'telephoneNumber' EQUALITY telephoneNumberMatch
+attributetype ( 2.5.4.20 NAME 'telephoneNumber'
+     EQUALITY telephoneNumberMatch
      SUBSTR telephoneNumberSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} )
 
@@ -209,18 +218,22 @@ attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier'
 attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' )
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
 
-attributetype ( 2.5.4.24 NAME 'x121Address' EQUALITY numericStringMatch
+attributetype ( 2.5.4.24 NAME 'x121Address'
+     EQUALITY numericStringMatch
      SUBSTR numericStringSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} )
 
-attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber' EQUALITY numericStringMatch
+attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber'
+     EQUALITY
+     numericStringMatch
      SUBSTR numericStringSubstringsMatch
      SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
 
 attributetype ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
 
-attributetype ( 2.5.4.27 NAME 'destinationIndicator' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.27 NAME 'destinationIndicator'
+     EQUALITY caseIgnoreMatch
       SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} )
 
@@ -261,32 +274,28 @@ attributetype ( 2.5.4.33 NAME 'roleOccupant' SUP distinguishedName )
 
 attributetype ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName )
 
-attributetype ( 2.5.4.35 NAME 'userPassword' EQUALITY octetStringMatch
+attributetype ( 2.5.4.35 NAME 'userPassword'
+      EQUALITY octetStringMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
 
 # Must be stored and requested in the binary form, as
 # userCertificate;binary
-
 attributetype ( 2.5.4.36 NAME 'userCertificate'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
 # As above
-
 attributetype ( 2.5.4.37 NAME 'cACertificate'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
 # As above
-
 attributetype ( 2.5.4.38 NAME 'authorityRevocationList'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
 
 # As above
-
 attributetype ( 2.5.4.39 NAME 'certificateRevocationList'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
 
 # As above
-
 attributetype ( 2.5.4.40 NAME 'crossCertificatePair'
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.10 )
 
@@ -296,11 +305,14 @@ attributetype ( 2.5.4.42 NAME 'givenName' SUP name )
 
 attributetype ( 2.5.4.43 NAME 'initials' SUP name )
 
-attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier' EQUALITY bitStringMatch
+attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier'
+      EQUALITY bitStringMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
 
-attributetype ( 2.5.4.46 NAME 'dnQualifier' EQUALITY caseIgnoreMatch
-      ORDERING caseIgnoreOrderingMatch SUBSTR caseIgnoreSubstringsMatch
+attributetype ( 2.5.4.46 NAME 'dnQualifier'
+      EQUALITY caseIgnoreMatch
+      ORDERING caseIgnoreOrderingMatch
+      SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.44 )
 
 attributetype ( 2.5.4.47 NAME 'enhancedSearchGuide'
@@ -312,10 +324,12 @@ attributetype ( 2.5.4.48 NAME 'protocolInformation'
 
 # 2.5.4.49 is distinguishedName, moved up
 
-attributetype ( 2.5.4.50 NAME 'uniqueMember' EQUALITY uniqueMemberMatch
+attributetype ( 2.5.4.50 NAME 'uniqueMember'
+      EQUALITY uniqueMemberMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
 
-attributetype ( 2.5.4.51 NAME 'houseIdentifier' EQUALITY caseIgnoreMatch
+attributetype ( 2.5.4.51 NAME 'houseIdentifier'
+      EQUALITY caseIgnoreMatch
       SUBSTR caseIgnoreSubstringsMatch
       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
 
@@ -335,17 +349,21 @@ attributetype ( 2.5.4.54 NAME 'dmdName' SUP name )
 
 # Standard object classes from RFC2256
 
-objectclass ( 2.5.6.0 NAME 'top' ABSTRACT MUST objectClass )
+objectclass ( 2.5.6.0 NAME 'top' ABSTRACT
+     MUST objectClass )
 
-objectclass ( 2.5.6.1 NAME 'alias' SUP top STRUCTURAL MUST aliasedObjectName )
+objectclass ( 2.5.6.1 NAME 'alias' SUP top STRUCTURAL
+     MUST aliasedObjectName )
 
-objectclass ( 2.5.6.2 NAME 'country' SUP top STRUCTURAL MUST c
+objectclass ( 2.5.6.2 NAME 'country' SUP top STRUCTURAL
+     MUST c
      MAY ( searchGuide $ description ) )
 
 objectclass ( 2.5.6.3 NAME 'locality' SUP top STRUCTURAL
      MAY ( street $ seeAlso $ searchGuide $ st $ l $ description ) )
 
-objectclass ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL MUST o
+objectclass ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL
+     MUST o
      MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
      x121Address $ registeredAddress $ destinationIndicator $
      preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
@@ -354,7 +372,8 @@ objectclass ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL MUST o
      street $ postOfficeBox $ postalCode $ postalAddress $
      physicalDeliveryOfficeName $ st $ l $ description ) )
 
-objectclass ( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL MUST ou
+objectclass ( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL
+     MUST ou
      MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
      x121Address $ registeredAddress $ destinationIndicator $
      preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
@@ -363,7 +382,8 @@ objectclass ( 2.5.6.5 NAME 'organizationalUnit' SUP top STRUCTURAL MUST ou
      street $ postOfficeBox $ postalCode $ postalAddress $
      physicalDeliveryOfficeName $ st $ l $ description ) )
 
-objectclass ( 2.5.6.6 NAME 'person' SUP top STRUCTURAL MUST ( sn $ cn )
+objectclass ( 2.5.6.6 NAME 'person' SUP top STRUCTURAL
+     MUST ( sn $ cn )
      MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )
 
 objectclass ( 2.5.6.7 NAME 'organizationalPerson' SUP person STRUCTURAL
@@ -377,7 +397,8 @@ objectclass ( 2.5.6.7 NAME 'organizationalPerson' SUP person STRUCTURAL
 
 # Notice that preferredDeliveryMethod is duplicate
 
-objectclass ( 2.5.6.8 NAME 'organizationalRole' SUP top STRUCTURAL MUST cn
+objectclass ( 2.5.6.8 NAME 'organizationalRole' SUP top STRUCTURAL
+     MUST cn
      MAY ( x121Address $ registeredAddress $ destinationIndicator $
      preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
      telephoneNumber $ internationaliSDNNumber $
@@ -386,7 +407,8 @@ objectclass ( 2.5.6.8 NAME 'organizationalRole' SUP top STRUCTURAL MUST cn
      postOfficeBox $ postalCode $ postalAddress $
      physicalDeliveryOfficeName $ ou $ st $ l $ description ) )
 
-objectclass ( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL MUST ( member $ cn )
+objectclass ( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL
+     MUST ( member $ cn )
      MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) )
 
 # Notice that preferredDeliveryMethod is duplicate
@@ -394,7 +416,8 @@ objectclass ( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL MUST ( member $ cn
 # in person.  Probably it wasn't originally at was added as an
 # afterthought
 
-objectclass ( 2.5.6.10 NAME 'residentialPerson' SUP person STRUCTURAL MUST l
+objectclass ( 2.5.6.10 NAME 'residentialPerson' SUP person STRUCTURAL
+     MUST l
      MAY ( businessCategory $ x121Address $ registeredAddress $
      destinationIndicator $ preferredDeliveryMethod $ telexNumber $
      teletexTerminalIdentifier $ telephoneNumber $
@@ -403,7 +426,8 @@ objectclass ( 2.5.6.10 NAME 'residentialPerson' SUP person STRUCTURAL MUST l
      postOfficeBox $ postalCode $ postalAddress $
      physicalDeliveryOfficeName $ st $ l ) )
 
-objectclass ( 2.5.6.11 NAME 'applicationProcess' SUP top STRUCTURAL MUST cn
+objectclass ( 2.5.6.11 NAME 'applicationProcess' SUP top STRUCTURAL
+     MUST cn
      MAY ( seeAlso $ ou $ l $ description ) )
 
 objectclass ( 2.5.6.12 NAME 'applicationEntity' SUP top STRUCTURAL
@@ -418,7 +442,8 @@ objectclass ( 2.5.6.12 NAME 'applicationEntity' SUP top STRUCTURAL
 objectclass ( 2.5.6.13 NAME 'dSA' SUP applicationEntity STRUCTURAL
      MAY knowledgeInformation )
 
-objectclass ( 2.5.6.14 NAME 'device' SUP top STRUCTURAL MUST cn
+objectclass ( 2.5.6.14 NAME 'device' SUP top STRUCTURAL
+     MUST cn
      MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $ description ) )
 
 objectclass ( 2.5.6.15 NAME 'strongAuthenticationUser' SUP top AUXILIARY
@@ -448,13 +473,14 @@ objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2' SUP
 # New
 
 objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint' SUP top STRUCTURAL
-     MUST ( cn ) MAY ( certificateRevocationList $
-     authorityRevocationList $
+     MUST ( cn )
+     MAY ( certificateRevocationList $ authorityRevocationList $
      deltaRevocationList ) )
 
 # New
 
-objectclass ( 2.5.6.20 NAME 'dmd' SUP top STRUCTURAL MUST ( dmdName )
+objectclass ( 2.5.6.20 NAME 'dmd' SUP top STRUCTURAL
+     MUST ( dmdName )
      MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
      x121Address $ registeredAddress $ destinationIndicator $
      preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
@@ -474,11 +500,13 @@ objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject'
 #
 attributetype ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI'
        DESC 'Uniform Resource Identifier with optional label'
-       EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+       EQUALITY caseExactIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
        DESC 'object that contains the URI attribute type'
-       MAY ( labeledURI ) SUP top AUXILIARY )
+       MAY ( labeledURI )
+       SUP top AUXILIARY )
 
 #
 # Standard Track Dynamic Directory Services from RFC2589
@@ -536,12 +564,13 @@ objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
 # LDAPsubEntry
 #      likely to change!
 objectclass ( 2.16.840.1.113719.2.142.6.1.1 NAME 'LDAPsubEntry'
-       DESC 'LDAP Subentry class'
+       DESC 'LDAP Subentry'
        SUP top STRUCTURAL MAY ( cn ) )
 
 #
 # LDAProotDSE
-#      no oid assigned
-objectclass ( LDAProotDSEOID NAME 'LDAProotDSE'
-       DESC 'Root DSE object class'
+#      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 )

diff --git a/servers/slapd/schema/microsoft.ext.schema b/servers/slapd/schema/microsoft.ext.schema
index 8f46866ba003a8831e02328f3055a13de17987d8..44612c268f1c7e7fd395e393987519ebe6141d05 100644 (file)
--- a/servers/slapd/schema/microsoft.ext.schema
+++ b/servers/slapd/schema/microsoft.ext.schema
@@ -1,5 +1,7 @@
 # $OpenLDAP$
 
+# This file is provided for informational purposes only.
+
 # These definitions are from Microsoft's Active Directory.
 # They were gathered using the subschemaSubentry object of
 # Windows 2000 Advanced Server Release Candidate 2.

diff --git a/servers/slapd/schema/microsoft.schema b/servers/slapd/schema/microsoft.schema
index 654fe156e6e2804ed391ad6e87a78e3a2499f07c..a2fe7a035b2f91953acf1232530cc9c67248d8bc 100644 (file)
--- a/servers/slapd/schema/microsoft.schema
+++ b/servers/slapd/schema/microsoft.schema
@@ -1,4 +1,5 @@
 # $OpenLDAP$
+# This file is provided for informational purposes only.
 
 # These definitions are from Microsoft's Active Directory.
 # They were gathered using the subschemaSubentry object of

diff --git a/servers/slapd/schema/microsoft.std.schema b/servers/slapd/schema/microsoft.std.schema
index fb9da9ef416db4a2f346176c31fac88f7a11ca8c..a808b7c19f590aa8f440a3a8ed81313b6a1c8ac8 100644 (file)
--- a/servers/slapd/schema/microsoft.std.schema
+++ b/servers/slapd/schema/microsoft.std.schema
@@ -1,4 +1,5 @@
 # $OpenLDAP$
+# This file is for informational purposes only
 
 # These definitions are from Microsoft's Active Directory.
 # They were gathered using the subschemaSubentry object of

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 5ac51be9f876e0cff7007db72077009a645a1a7b..870bbb19e616b2d347351270cc3e3350a4b78df5 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -29,6 +29,7 @@ objectclass ( 2.16.840.1.113730.3.2.3 NAME 'mailRecipient'
        SUP top AUXILIARY
        MAY     ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress ))
 
+# Needs an OID
 #objectclass ( 2.16.840.1.113730.3.2.[[TBD]] NAME 'inetLocalMailRecipient'
 #      SUP top AUXILIARY
 #      MAY     ( mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress )

diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema
index 4e890e435fe8ea540d406147e1e68135cd397dc6..525ee5c030466d8b883be01470dc4751e083bfb8 100644 (file)
--- a/servers/slapd/schema/nis.schema
+++ b/servers/slapd/schema/nis.schema
@@ -25,11 +25,10 @@ attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber'
        EQUALITY integerMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-# TBC: caseIgnoreIA5SubstringsMatch is not defined
-
 attributetype ( 1.3.6.1.1.1.1.2 NAME 'gecos'
        DESC 'The GECOS field; the common name'
        EQUALITY caseIgnoreIA5Match
+       SUBSTRINGS caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.1.1.1.3 NAME 'homeDirectory'
@@ -70,16 +69,14 @@ attributetype ( 1.3.6.1.1.1.1.11 NAME 'shadowFlag'
        EQUALITY integerMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-# TBC: caseIgnoreIA5SubstringsMatch is not defined
-
 attributetype ( 1.3.6.1.1.1.1.12 NAME 'memberUid'
        EQUALITY caseExactIA5Match
+       SUBSTRINGS caseExactIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-# TBC: caseIgnoreIA5SubstringsMatch is not defined
-
 attributetype ( 1.3.6.1.1.1.1.13 NAME 'memberNisNetgroup'
        EQUALITY caseExactIA5Match
+       SUBSTRINGS caseExactIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 attributetype ( 1.3.6.1.1.1.1.14 NAME 'nisNetgroupTriple'
@@ -133,10 +130,9 @@ attributetype ( 1.3.6.1.1.1.1.24 NAME 'bootFile'
 attributetype ( 1.3.6.1.1.1.1.26 NAME 'nisMapName'
        SUP name )
 
-# TBC: caseIgnoreIA5SubstringsMatch is not defined
-
 attributetype ( 1.3.6.1.1.1.1.27 NAME 'nisMapEntry'
        EQUALITY caseExactIA5Match
+       SUBSTR caseExactIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} SINGLE-VALUE )
 
 # Object Class Definitions
@@ -158,8 +154,6 @@ objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup' SUP top STRUCTURAL
        MUST ( cn $ gidNumber )
        MAY ( userPassword $ memberUid $ description ) )
 
-# TBC: quotes in quoted strings
-
 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)
@@ -169,8 +163,6 @@ objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService' SUP top STRUCTURAL
        MUST ( cn $ ipServicePort $ ipServiceProtocol )
        MAY ( description ) )
 
-# TBC: quotes in quoted strings
-
 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
@@ -178,8 +170,6 @@ objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol' SUP top STRUCTURAL
        MUST ( cn $ ipProtocolNumber $ description )
        MAY description )
 
-# TBC: quotes in quoted strings
-
 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.
@@ -189,8 +179,6 @@ objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc' SUP top STRUCTURAL
        MUST ( cn $ oncRpcNumber $ description )
        MAY description )
 
-# TBC: quotes in quoted strings
-
 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
@@ -198,8 +186,6 @@ objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost' SUP top AUXILIARY
        MUST ( cn $ ipHostNumber )
        MAY ( l $ description $ manager ) )
 
-# TBC: quotes in quoted strings
-
 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'

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 70d17ba0673fd1819e27187a96f3bbc5e1dd573b..f04e4ebbca7fe0a2e8c4614b1c1ce2f15790d3d7 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -378,7 +378,6 @@ struct mrule_defs_rec {
  * Other matching rules in X.520 that we do not use:
  *
  * 2.5.13.9            numericStringOrderingMatch
- * 2.5.13.12   caseIgnoreListSubstringsMatch
  * 2.5.13.13   booleanMatch
  * 2.5.13.15   integerOrderingMatch
  * 2.5.13.18   octetStringOrderingMatch
@@ -415,6 +414,7 @@ struct mrule_defs_rec {
 #define numericStringMatch NULL
 #define numericStringSubstringsMatch NULL
 #define caseIgnoreListMatch NULL
+#define caseIgnoreListSubstringsMatch NULL
 #define integerMatch NULL
 #define bitStringMatch NULL
 #define octetStringMatch NULL
@@ -486,6 +486,11 @@ struct mrule_defs_rec mrule_defs[] = {
                SLAP_MR_EQUALITY | SLAP_MR_EXT,
                NULL, NULL, caseIgnoreListMatch, NULL, NULL},
 
+       {"( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch' "
+               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
+               SLAP_MR_SUBSTR | SLAP_MR_EXT,
+               NULL, NULL, caseIgnoreListSubstringsMatch, NULL, NULL},
+
        {"( 2.5.13.14 NAME 'integerMatch' "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
                SLAP_MR_NONE | SLAP_MR_EXT,