diff --git a/servers/slapd/schema/README b/servers/slapd/schema/README
index c10867cca2..364d79ec32 100644
--- a/servers/slapd/schema/README
+++ b/servers/slapd/schema/README
@@ -19,6 +19,7 @@ nadf.schema North American Directory Forum (obsolete)
nis.schema Network Information Service
openldap.schema OpenLDAP Project (FYI)
ppolicy.schema Password Policy Schema (experimental)
+test.schema Test Schema
Additional "generally useful" schema definitions can be submitted
using the OpenLDAP Issue Tracking System .
diff --git a/servers/slapd/schema/compfilter.schema b/servers/slapd/schema/compfilter.schema
deleted file mode 100644
index 99546f7722..0000000000
--- a/servers/slapd/schema/compfilter.schema
+++ /dev/null
@@ -1,586 +0,0 @@
-# OpenLDAP Core schema
-# $OpenLDAP$
-## This work is part of OpenLDAP Software .
-##
-## Copyright 1998-2004 The OpenLDAP Foundation.
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted only as authorized by the OpenLDAP
-## Public License.
-##
-## A copy of this license is available in the file LICENSE in the
-## top-level directory of the distribution or, alternatively, at
-## .
-#
-## Portions Copyright (C) The Internet Society (1997-2003).
-## All Rights Reserved.
-##
-## This document and translations of it may be copied and furnished to
-## others, and derivative works that comment on or otherwise explain it
-## or assist in its implementation may be prepared, copied, published
-## and distributed, in whole or in part, without restriction of any
-## kind, provided that the above copyright notice and this paragraph are
-## included on all such copies and derivative works. However, this
-## document itself may not be modified in any way, such as by removing
-## the copyright notice or references to the Internet Society or other
-## Internet organizations, except as needed for the purpose of
-## developing Internet standards in which case the procedures for
-## copyrights defined in the Internet Standards process must be
-## followed, or as required to translate it into languages other than
-## English.
-##
-## The limited permissions granted above are perpetual and will not be
-## revoked by the Internet Society or its successors or assigns.
-##
-## This document and the information contained herein is provided on an
-## "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-## TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-## BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-## HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-## MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-#
-#
-# Includes LDAPv3 schema items from:
-# RFC 2252/2256 (LDAPv3)
-#
-# Select standard track schema items:
-# RFC 1274 (uid/dc)
-# RFC 2079 (URI)
-# RFC 2247 (dc/dcObject)
-# RFC 2587 (PKI)
-# RFC 2589 (Dynamic Directory Services)
-#
-# Select informational schema items:
-# RFC 2377 (uidObject)
-
-#
-# Standard attribute types from RFC 2256
-#
-
-# system schema
-#attributetype ( 2.5.4.0 NAME 'objectClass'
-# DESC 'RFC2256: object classes of the entity'
-# EQUALITY objectIdentifierMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-
-# system schema
-#attributetype ( 2.5.4.1 NAME ( 'aliasedObjectName' 'aliasedEntryName' )
-# DESC 'RFC2256: name of aliased object'
-# EQUALITY distinguishedNameMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
-
-attributetype ( 2.5.4.2 NAME 'knowledgeInformation'
- DESC 'RFC2256: knowledge information'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
-
-# system schema
-#attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' )
-# DESC 'RFC2256: common name(s) for which the entity is known by'
-# SUP name )
-
-attributetype ( 2.5.4.4 NAME ( 'sn' 'surname' )
- DESC 'RFC2256: last (family) name(s) for which the entity is known by'
- SUP name )
-
-attributetype ( 2.5.4.5 NAME 'serialNumber'
- DESC 'RFC2256: serial number of the entity'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} )
-
-attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' )
- DESC 'RFC2256: ISO-3166 country 2-letter code'
- SUP name SINGLE-VALUE )
-
-attributetype ( 2.5.4.7 NAME ( 'l' 'localityName' )
- DESC 'RFC2256: locality which this object resides in'
- SUP name )
-
-attributetype ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' )
- DESC 'RFC2256: state or province which this object resides in'
- SUP name )
-
-attributetype ( 2.5.4.9 NAME ( 'street' 'streetAddress' )
- DESC 'RFC2256: street address of this object'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 2.5.4.10 NAME ( 'o' 'organizationName' )
- DESC 'RFC2256: organization this object belongs to'
- SUP name )
-
-attributetype ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' )
- DESC 'RFC2256: organizational unit this object belongs to'
- SUP name )
-
-attributetype ( 2.5.4.12 NAME 'title'
- DESC 'RFC2256: title associated with the entity'
- SUP name )
-
-attributetype ( 2.5.4.13 NAME 'description'
- DESC 'RFC2256: descriptive information'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-
-# Obsoleted by enhancedSearchGuide
-attributetype ( 2.5.4.14 NAME 'searchGuide'
- DESC 'RFC2256: search guide, obsoleted by enhancedSearchGuide'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
-
-attributetype ( 2.5.4.15 NAME 'businessCategory'
- DESC 'RFC2256: business category'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 2.5.4.16 NAME 'postalAddress'
- DESC 'RFC2256: postal address'
- EQUALITY caseIgnoreListMatch
- SUBSTR caseIgnoreListSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-attributetype ( 2.5.4.17 NAME 'postalCode'
- DESC 'RFC2256: postal code'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
-
-attributetype ( 2.5.4.18 NAME 'postOfficeBox'
- DESC 'RFC2256: Post Office Box'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
-
-attributetype ( 2.5.4.19 NAME 'physicalDeliveryOfficeName'
- DESC 'RFC2256: Physical Delivery Office Name'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 2.5.4.20 NAME 'telephoneNumber'
- DESC 'RFC2256: Telephone Number'
- EQUALITY telephoneNumberMatch
- SUBSTR telephoneNumberSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} )
-
-attributetype ( 2.5.4.21 NAME 'telexNumber'
- DESC 'RFC2256: Telex Number'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.52 )
-
-attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier'
- DESC 'RFC2256: Teletex Terminal Identifier'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.51 )
-
-attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' )
- DESC 'RFC2256: Facsimile (Fax) Telephone Number'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
-
-attributetype ( 2.5.4.24 NAME 'x121Address'
- DESC 'RFC2256: X.121 Address'
- EQUALITY numericStringMatch
- SUBSTR numericStringSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} )
-
-attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber'
- DESC 'RFC2256: international ISDN number'
- EQUALITY numericStringMatch
- SUBSTR numericStringSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
-
-attributetype ( 2.5.4.26 NAME 'registeredAddress'
- DESC 'RFC2256: registered postal address'
- SUP postalAddress
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-attributetype ( 2.5.4.27 NAME 'destinationIndicator'
- DESC 'RFC2256: destination indicator'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} )
-
-attributetype ( 2.5.4.28 NAME 'preferredDeliveryMethod'
- DESC 'RFC2256: preferred delivery method'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.14
- SINGLE-VALUE )
-
-attributetype ( 2.5.4.29 NAME 'presentationAddress'
- DESC 'RFC2256: presentation address'
- EQUALITY presentationAddressMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.43
- SINGLE-VALUE )
-
-attributetype ( 2.5.4.30 NAME 'supportedApplicationContext'
- DESC 'RFC2256: supported application context'
- EQUALITY objectIdentifierMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-
-attributetype ( 2.5.4.31 NAME 'member'
- DESC 'RFC2256: member of a group'
- SUP distinguishedName )
-
-attributetype ( 2.5.4.32 NAME 'owner'
- DESC 'RFC2256: owner (of the object)'
- SUP distinguishedName )
-
-attributetype ( 2.5.4.33 NAME 'roleOccupant'
- DESC 'RFC2256: occupant of role'
- SUP distinguishedName )
-
-attributetype ( 2.5.4.34 NAME 'seeAlso'
- DESC 'RFC2256: DN of related object'
- SUP distinguishedName )
-
-# system schema
-#attributetype ( 2.5.4.35 NAME 'userPassword'
-# DESC 'RFC2256/2307: password of user'
-# EQUALITY octetStringMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
-
-# Must be transferred using ;binary
-# with certificateExactMatch rule (per X.509)
-attributetype ( 2.5.4.36 NAME 'userCertificate'
- DESC 'RFC2256: X.509 user certificate, use ;binary'
- EQUALITY certificateExactMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
-
-# Must be transferred using ;binary
-# with certificateExactMatch rule (per X.509)
-attributetype ( 2.5.4.37 NAME 'cACertificate'
- DESC 'RFC2256: X.509 CA certificate, use ;binary'
- EQUALITY certificateExactMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
-
-# Must be transferred using ;binary
-attributetype ( 2.5.4.38 NAME 'authorityRevocationList'
- DESC 'RFC2256: X.509 authority revocation list, use ;binary'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
-
-# Must be transferred using ;binary
-attributetype ( 2.5.4.39 NAME 'certificateRevocationList'
- DESC 'RFC2256: X.509 certificate revocation list, use ;binary'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
-
-# Must be stored and requested in the binary form
-attributetype ( 2.5.4.40 NAME 'crossCertificatePair'
- DESC 'RFC2256: X.509 cross certificate pair, use ;binary'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.10 )
-
-# 2.5.4.41 is defined above as it's used for subtyping
-#attributetype ( 2.5.4.41 NAME 'name'
-# EQUALITY caseIgnoreMatch
-# SUBSTR caseIgnoreSubstringsMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
-
-attributetype ( 2.5.4.42 NAME ( 'givenName' 'gn' )
- DESC 'RFC2256: first name(s) for which the entity is known by'
- SUP name )
-
-attributetype ( 2.5.4.43 NAME 'initials'
- DESC 'RFC2256: initials of some or all of names, but not the surname(s).'
- SUP name )
-
-attributetype ( 2.5.4.44 NAME 'generationQualifier'
- DESC 'RFC2256: name qualifier indicating a generation'
- SUP name )
-
-attributetype ( 2.5.4.45 NAME 'x500UniqueIdentifier'
- DESC 'RFC2256: X.500 unique identifier'
- EQUALITY bitStringMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
-
-attributetype ( 2.5.4.46 NAME 'dnQualifier'
- DESC 'RFC2256: DN qualifier'
- 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'
- DESC 'RFC2256: enhanced search guide'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.21 )
-
-attributetype ( 2.5.4.48 NAME 'protocolInformation'
- DESC 'RFC2256: protocol information'
- EQUALITY protocolInformationMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
-
-# RFC 3687 -- componentFilterMatch
-attributetype ( 1.3.6.1.4.1.4203.666.1.33 NAME 'componentTest'
- DESC 'RFC 3687 Component Matching, use ;gser'
- EQUALITY componentFilterMatch
- SYNTAX 1.2.36.79672281.1.5.2 )
-# 2.5.4.49 is defined above as it's used for subtyping
-#attributetype ( 2.5.4.49 NAME 'distinguishedName'
-# EQUALITY distinguishedNameMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 2.5.4.50 NAME 'uniqueMember'
- DESC 'RFC2256: unique member of a group'
- EQUALITY uniqueMemberMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
-
-attributetype ( 2.5.4.51 NAME 'houseIdentifier'
- DESC 'RFC2256: house identifier'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
-
-# Must be transferred using ;binary
-attributetype ( 2.5.4.52 NAME 'supportedAlgorithms'
- DESC 'RFC2256: supported algorithms'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.49 )
-
-# Must be transferred using ;binary
-attributetype ( 2.5.4.53 NAME 'deltaRevocationList'
- DESC 'RFC2256: delta revocation list; use ;binary'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.9 )
-
-attributetype ( 2.5.4.54 NAME 'dmdName'
- DESC 'RFC2256: name of DMD'
- SUP name )
-
-
-# Standard object classes from RFC2256
-
-# system schema
-#objectclass ( 2.5.6.1 NAME 'alias'
-# DESC 'RFC2256: an alias'
-# SUP top STRUCTURAL
-# MUST aliasedObjectName )
-
-objectclass ( 2.5.6.2 NAME 'country'
- DESC 'RFC2256: a country'
- SUP top STRUCTURAL
- MUST c
- MAY ( searchGuide $ description ) )
-
-objectclass ( 2.5.6.3 NAME 'locality'
- DESC 'RFC2256: a locality'
- SUP top STRUCTURAL
- MAY ( street $ seeAlso $ searchGuide $ st $ l $ description ) )
-
-objectclass ( 2.5.6.4 NAME 'organization'
- DESC 'RFC2256: an organization'
- SUP top STRUCTURAL
- MUST o
- MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
- x121Address $ registeredAddress $ destinationIndicator $
- preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
- telephoneNumber $ internationaliSDNNumber $
- facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
- postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )
-
-objectclass ( 2.5.6.5 NAME 'organizationalUnit'
- DESC 'RFC2256: an organizational unit'
- SUP top STRUCTURAL
- MUST ou
- MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
- x121Address $ registeredAddress $ destinationIndicator $
- preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
- telephoneNumber $ internationaliSDNNumber $
- facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
- postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )
-
-objectclass ( 2.5.6.6 NAME 'person'
- DESC 'RFC2256: a person'
- SUP top STRUCTURAL
- MUST ( sn $ cn )
- MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )
-
-objectclass ( 2.5.6.7 NAME 'organizationalPerson'
- DESC 'RFC2256: an organizational person'
- SUP person STRUCTURAL
- MAY ( title $ x121Address $ registeredAddress $ destinationIndicator $
- preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
- telephoneNumber $ internationaliSDNNumber $ componentTest $
- facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
- postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) )
-
-objectclass ( 2.5.6.8 NAME 'organizationalRole'
- DESC 'RFC2256: an organizational role'
- SUP top STRUCTURAL
- MUST cn
- MAY ( x121Address $ registeredAddress $ destinationIndicator $
- preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
- telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $
- seeAlso $ roleOccupant $ preferredDeliveryMethod $ street $
- postOfficeBox $ postalCode $ postalAddress $
- physicalDeliveryOfficeName $ ou $ st $ l $ description ) )
-
-objectclass ( 2.5.6.9 NAME 'groupOfNames'
- DESC 'RFC2256: a group of names (DNs)'
- SUP top STRUCTURAL
- MUST ( member $ cn )
- MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) )
-
-objectclass ( 2.5.6.10 NAME 'residentialPerson'
- DESC 'RFC2256: an residential person'
- SUP person STRUCTURAL
- MUST l
- MAY ( businessCategory $ x121Address $ registeredAddress $
- destinationIndicator $ preferredDeliveryMethod $ telexNumber $
- teletexTerminalIdentifier $ telephoneNumber $ internationaliSDNNumber $
- facsimileTelephoneNumber $ preferredDeliveryMethod $ street $
- postOfficeBox $ postalCode $ postalAddress $
- physicalDeliveryOfficeName $ st $ l ) )
-
-objectclass ( 2.5.6.11 NAME 'applicationProcess'
- DESC 'RFC2256: an application process'
- SUP top STRUCTURAL
- MUST cn
- MAY ( seeAlso $ ou $ l $ description ) )
-
-objectclass ( 2.5.6.12 NAME 'applicationEntity'
- DESC 'RFC2256: an application entity'
- SUP top STRUCTURAL
- MUST ( presentationAddress $ cn )
- MAY ( supportedApplicationContext $ seeAlso $ ou $ o $ l $
- description ) )
-
-objectclass ( 2.5.6.13 NAME 'dSA'
- DESC 'RFC2256: a directory system agent (a server)'
- SUP applicationEntity STRUCTURAL
- MAY knowledgeInformation )
-
-objectclass ( 2.5.6.14 NAME 'device'
- DESC 'RFC2256: a device'
- SUP top STRUCTURAL
- MUST cn
- MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $ description ) )
-
-objectclass ( 2.5.6.15 NAME 'strongAuthenticationUser'
- DESC 'RFC2256: a strong authentication user'
- SUP top AUXILIARY
- MUST userCertificate )
-
-objectclass ( 2.5.6.16 NAME 'certificationAuthority'
- DESC 'RFC2256: a certificate authority'
- SUP top AUXILIARY
- MUST ( authorityRevocationList $ certificateRevocationList $
- cACertificate ) MAY crossCertificatePair )
-
-objectclass ( 2.5.6.17 NAME 'groupOfUniqueNames'
- DESC 'RFC2256: a group of unique names (DN and Unique Identifier)'
- SUP top STRUCTURAL
- MUST ( uniqueMember $ cn )
- MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) )
-
-objectclass ( 2.5.6.18 NAME 'userSecurityInformation'
- DESC 'RFC2256: a user security information'
- SUP top AUXILIARY
- MAY ( supportedAlgorithms ) )
-
-objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2'
- SUP certificationAuthority
- AUXILIARY MAY ( deltaRevocationList ) )
-
-objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint'
- SUP top STRUCTURAL
- MUST ( cn )
- MAY ( certificateRevocationList $ authorityRevocationList $
- deltaRevocationList ) )
-
-objectclass ( 2.5.6.20 NAME 'dmd'
- SUP top STRUCTURAL
- MUST ( dmdName )
- MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
- x121Address $ registeredAddress $ destinationIndicator $
- preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
- telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $
- street $ postOfficeBox $ postalCode $ postalAddress $
- physicalDeliveryOfficeName $ st $ l $ description ) )
-
-#
-# Object Classes from RFC 2587
-#
-objectclass ( 2.5.6.21 NAME 'pkiUser'
- DESC 'RFC2587: a PKI user'
- SUP top AUXILIARY
- MAY userCertificate )
-
-objectclass ( 2.5.6.22 NAME 'pkiCA'
- DESC 'RFC2587: PKI certificate authority'
- SUP top AUXILIARY
- MAY ( authorityRevocationList $ certificateRevocationList $
- cACertificate $ crossCertificatePair ) )
-
-objectclass ( 2.5.6.23 NAME 'deltaCRL'
- DESC 'RFC2587: PKI user'
- SUP top AUXILIARY
- MAY deltaRevocationList )
-
-#
-# Standard Track URI label schema from RFC 2079
-# system schema
-#attributetype ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI'
-# DESC 'RFC2079: Uniform Resource Identifier with optional label'
-# EQUALITY caseExactMatch
-# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-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 )
-
-#
-# Derived from RFC 1274, but with new "short names"
-#
-attributetype ( 0.9.2342.19200300.100.1.1
- NAME ( 'uid' 'userid' )
- DESC 'RFC1274: user identifier'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
-attributetype ( 0.9.2342.19200300.100.1.3
- NAME ( 'mail' 'rfc822Mailbox' )
- DESC 'RFC1274: RFC822 Mailbox'
- 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'
- DESC 'RFC1274: simple security object'
- SUP top AUXILIARY
- MUST userPassword )
-
-# RFC 1274 + RFC 2247
-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 )
-
-# RFC 2247
-objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
- DESC 'RFC2247: domain component object'
- SUP top AUXILIARY MUST dc )
-
-# RFC 2377
-objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
- DESC 'RFC2377: uid object'
- SUP top AUXILIARY MUST uid )
-
-# From COSINE Pilot
-attributetype ( 0.9.2342.19200300.100.1.37
- NAME 'associatedDomain'
- DESC 'RFC1274: domain associated with object'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# RFC 2459 -- deprecated in favor of 'mail' (in cosine.schema)
-attributetype ( 1.2.840.113549.1.9.1
- NAME ( 'email' 'emailAddress' 'pkcs9email' )
- DESC 'RFC2459: legacy attribute for email addresses in DNs'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
-
-
diff --git a/servers/slapd/schema/test.schema b/servers/slapd/schema/test.schema
new file mode 100644
index 0000000000..1180f1542c
--- /dev/null
+++ b/servers/slapd/schema/test.schema
@@ -0,0 +1,23 @@
+# OpenLDAP Test schema
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2004 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+#
+
+# For testing purposes only.
+
+# RFC 3687 -- componentFilterMatch
+attributetype ( 1.3.6.1.4.1.4203.666.1.33 NAME 'componentTest'
+ DESC 'RFC 3687 Component Matching, use ;gser'
+ EQUALITY componentFilterMatch
+ SYNTAX 1.2.36.79672281.1.5.2 )
diff --git a/tests/data/compsearch.out b/tests/data/compsearch.out
index 4e1cf2e52d..fb55ca6636 100644
--- a/tests/data/compsearch.out
+++ b/tests/data/compsearch.out
@@ -1,128 +1,64 @@
-dn: cn=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: sangseoklim
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: sangseoklim
+cn: Sang Seok Lim
+sn: Lim
componentTest: component1
-dn: cn=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: seotaejee
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: seotaejee
+cn: Seo Tae Jee
+sn: Jee
componentTest: component2
-dn: cn=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: sangseoklim
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: sangseoklim
+cn: Sang Seok Lim
+sn: Lim
componentTest: component1
-dn: cn=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: seotaejee
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: seotaejee
+cn: Seo Tae Jee
+sn: Jee
componentTest: component2
-dn: cn=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: sangseoklim
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: sangseoklim
+cn: Sang Seok Lim
+sn: Lim
componentTest: component1
-dn: cn=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: seotaejee
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: seotaejee
+cn: Seo Tae Jee
+sn: Jee
componentTest: component2
-dn: cn=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: sangseoklim
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: sangseoklim
+cn: Sang Seok Lim
+sn: Lim
componentTest: component1
-dn: cn=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
-cn: seotaejee
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com
-homePostalAddress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homePhone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimileTelephoneNumber: +1 313 555 9700
-telephoneNumber: +1 313 555 5331
+objectClass: extensibleObject
+uid: seotaejee
+cn: Seo Tae Jee
+sn: Jee
componentTest: component2
diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index cded754cbf..1d896a8408 100644
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -14,11 +14,12 @@
## top-level directory of the distribution or, alternatively, at
## .
-include ./schema/compfilter.schema
+include ./schema/core.schema
include ./schema/cosine.schema
include ./schema/inetorgperson.schema
include ./schema/openldap.schema
include ./schema/nis.schema
+include ./schema/test.schema
include ./testdata/ditcontentrules.conf
diff --git a/tests/data/test-compmatch.ldif b/tests/data/test-compmatch.ldif
index 2ee54db70a..d8fdf80160 100644
--- a/tests/data/test-compmatch.ldif
+++ b/tests/data/test-compmatch.ldif
@@ -395,34 +395,18 @@ pager: +1 313 555 7671
facsimiletelephonenumber: +1 313 555 7762
telephonenumber: +1 313 555 4177
-dn: cn=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=sangseoklim,ou=Alumni Association,ou=People,dc=example,dc=com
objectclass: OpenLDAPperson
-cn: sangseoklim
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seealso: cn=All Staff,ou=Groups,dc=example,dc=com
-homepostaladdress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homephone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimiletelephonenumber: +1 313 555 9700
-telephonenumber: +1 313 555 5331
+objectclass: extensibleObject
+uid: sangseoklim
+cn: Sang Seok Lim
+sn: Lim
componentTest: component1
-dn: cn=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
+dn: uid=seotaejee,ou=Alumni Association,ou=People,dc=example,dc=com
objectclass: OpenLDAPperson
-cn: seotaejee
-sn: Hampster
-uid: uham
-title: Secretary, UM Alumni Association
-postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109
-seealso: cn=All Staff,ou=Groups,dc=example,dc=com
-homepostaladdress: 123 Anystreet $ Anytown, MI 48104
-mail: uham@mail.alumni.example.com
-homephone: +1 313 555 8421
-pager: +1 313 555 2844
-facsimiletelephonenumber: +1 313 555 9700
-telephonenumber: +1 313 555 5331
+objectclass: extensibleObject
+uid: seotaejee
+cn: Seo Tae Jee
+sn: Jee
componentTest: component2