upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

move mail and simpleSecurityObject to core.schema

Browse source
This commit is contained in:
Kurt Zeilenga 2000-05-17 02:52:32 +00:00
parent 06a18f628e
commit 4d23358a8e
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
servers/slapd/schema/core.schema
View file

@ -7,7 +7,7 @@
#
# select standard track schema items:
# RFC2079 (URI)
# RFC1274 (uid)
# RFC1274 (uid/dc)
# RFC2247 (dc/dcObject)
# RFC2289 (Dynamic Directory Services)
#
@ -525,6 +525,22 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION
USAGE dSAOperation )
# Derived from RFC1274
attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
DESC 'RFC1274 user identifier'
SUP name )
attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
DESC 'rfc822 mail box'
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'
SUP top AUXILIARY
MUST userPassword )
# RFC1274 + RFC2247
attributetype ( 0.9.2342.19200300.100.1.25
NAME ( 'dc' 'domainComponent' )
@ -537,12 +553,8 @@ attributetype ( 0.9.2342.19200300.100.1.25
objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject'
SUP top AUXILIARY MUST dc )
# Derived from RFC1274
attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
DESC 'RFC1274 user identifier'
SUP name )
# RFC2377
# From RFC2377
objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
DESC 'RFC2377 uid object'
SUP top AUXILIARY MUST uid )

17
servers/slapd/schema/cosine.schema
View file

@ -129,11 +129,11 @@ attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
# (SIZE (1 .. ub-rfc822-mailbox))
# ::= {pilotAttributeType 3}
#
#(in inetorgperson.schema)
attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
#(in core.schema)
##attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
## EQUALITY caseIgnoreIA5Match
## SUBSTR caseIgnoreIA5SubstringsMatch
## SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
# 9.3.4. Information
#
@ -1261,9 +1261,10 @@ objectclass ( 0.9.2342.19200300.100.4.18 NAME 'friendlyCountry'
# userPassword }
# ::= {pilotObjectClass 19}
#
objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
SUP top AUXILIARY
MUST userPassword )
## (in core.schema)
## objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
## SUP top AUXILIARY
## MUST userPassword )
# 8.3.13. Pilot Organization
#