mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shift a few more "core" items from pilot to core.

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-11-22 00:01:44 +00:00
parent 1113769e54
commit bc0d17ba1e
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
servers/slapd/schema/core.schema
View File

@ -2,15 +2,24 @@
#
# OpenLDAP Core schema
#
# Includes "standard" schema items from:
# Includes LDAPv3 schema items from:
# RFC2251-RFC2256 (LDAPv3)
# RFC2079 (URI)
#
# and other "core" items
# ldapsubentry draft
# select standard track schema items:
# RFC2079 (URI)
# RFC1274 (uid)
# RFC2247 (dc/dcObject)
# RFC2289 (Dynamic Directory Services)
#
# select informational schema items:
# RFC2377 (uidObject)
#
# select experimental IETF LDAPext items
# ldapSubentry draft
# ldapRootDSE
# named referrals draft
# alias draft
#
# Standard X.501(93) Operational Attribute Types from RFC2252
@ -481,13 +490,22 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees'
#
# RFC2247
# This may need to be moved to core.schema
objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject' SUP top AUXILIARY MUST dc )
attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
SUP top AUXILIARY MUST dc )
# RFC1274
attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
#
# RFC2377
# This may need to be moved to core.schema
objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' SUP top AUXILIARY MUST uid )
objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
SUP top AUXILIARY MUST uid )
#
# From draft-ietf-ldapext-nameref-00.txt

12
servers/slapd/schema/pilot.schema
View File

@ -21,10 +21,6 @@
# Believe it or not, this is case-insensitive
attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
@ -106,13 +102,10 @@ attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
# This is the definition as defined in RFC2247
# Terrific, we don't know about caseIgnoreIA5SubstringsMatch
#attribute ( 0.9.2342.19200300.100.1.25 NAME 'dc'
# See RFC2247 define in core.schema
#attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
# EQUALITY caseIgnoreIA5Match
# SUBSTR caseIgnoreIA5SubstringsMatch
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
# This is aRecord in RFC1274. However, objectclass dNSDomain as we
# and Netscape use it is very different.
@ -317,7 +310,6 @@ objectclass ( 0.9.2342.19200300.100.4.9 NAME 'documentSeries' SUP top
l $ o $ ou ) )
# This definition is much longer than that in RFC1274 and is taken from RFC2247
objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain' SUP top STRUCTURAL
MUST dc
MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $