mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-02-23 14:09:39 +08:00
Cleanup last commit. Need to add more internal schema....
This commit is contained in:
Kurt Zeilenga
parent
6ed15e3350
commit
7fcf4e011c
@ -17,7 +17,7 @@ SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.c \
|
||||
repl.c lock.c controls.c extended.c kerberos.c passwd.c \
|
||||
schema.c schema_check.c schema_init.c schema_prep.c \
|
||||
schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \
|
||||
starttls.c index.c sets.c referral.c \
|
||||
oidm.c starttls.c index.c sets.c referral.c \
|
||||
root_dse.c sasl.c module.c suffixalias.c mra.c mods.c \
|
||||
limits.c backglue.c operational.c \
|
||||
$(@PLAT@_SRCS)
|
||||
@ -30,7 +30,7 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \
|
||||
repl.o lock.o controls.o extended.o kerberos.o passwd.o \
|
||||
schema.o schema_check.o schema_init.o schema_prep.o \
|
||||
schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \
|
||||
starttls.o index.o sets.o referral.o \
|
||||
oidm.o starttls.o index.o sets.o referral.o \
|
||||
root_dse.o sasl.o module.o suffixalias.o mra.o mods.o \
|
||||
limits.o backglue.o operational.o \
|
||||
$(@PLAT@_OBJS)
|
||||
|
||||
@ -25,44 +25,6 @@
|
||||
# Standard X.501(93) Operational Attribute Types from RFC 2252
|
||||
#
|
||||
|
||||
attributetype ( 2.5.18.1 NAME 'createTimestamp'
|
||||
DESC 'RFC2252: time which object was created'
|
||||
EQUALITY generalizedTimeMatch
|
||||
ORDERING generalizedTimeOrderingMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.18.2 NAME 'modifyTimestamp'
|
||||
DESC 'RFC2252: time which object was last modified'
|
||||
EQUALITY generalizedTimeMatch
|
||||
ORDERING generalizedTimeOrderingMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.18.3 NAME 'creatorsName'
|
||||
DESC 'RFC2252: name of creator'
|
||||
EQUALITY distinguishedNameMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.18.4 NAME 'modifiersName'
|
||||
DESC 'RFC2252: name of last modifier'
|
||||
EQUALITY distinguishedNameMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.18.9 NAME 'hasSubordinates'
|
||||
DESC 'X.501: entry has children'
|
||||
EQUALITY booleanMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.18.10 NAME 'subschemaSubentry'
|
||||
DESC 'RFC2252: name of controlling subschema entry'
|
||||
EQUALITY distinguishedNameMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION
|
||||
SINGLE-VALUE USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.21.1 NAME 'dITStructureRules'
|
||||
DESC 'RFC2252: DIT structure rules'
|
||||
EQUALITY integerFirstComponentMatch
|
||||
@ -73,21 +35,6 @@ attributetype ( 2.5.21.2 NAME 'dITContentRules'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.21.4 NAME 'matchingRules'
|
||||
DESC 'RFC2252: matching rules'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.30 USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.21.5 NAME 'attributeTypes'
|
||||
DESC 'RFC2252: attribute types'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.3 USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.21.6 NAME 'objectClasses'
|
||||
DESC 'RFC2252: object classes'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.37 USAGE directoryOperation )
|
||||
|
||||
attributetype ( 2.5.21.7 NAME 'nameForms'
|
||||
DESC 'RFC2252: name forms '
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
@ -98,56 +45,18 @@ attributetype ( 2.5.21.8 NAME 'matchingRuleUse'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation )
|
||||
|
||||
# From X.500(93)
|
||||
attributetype ( 2.5.21.9 NAME 'structuralObjectClass'
|
||||
DESC 'X.500(93): structural object class of entry'
|
||||
EQUALITY objectIdentifierMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
|
||||
NO-USER-MODIFICATION SINGLE-VALUE USAGE directoryOperation )
|
||||
|
||||
#
|
||||
# LDAP Operational Attributes from RFC 2252
|
||||
#
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.5 NAME 'namingContexts'
|
||||
DESC 'RFC2252: naming contexts'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer'
|
||||
DESC 'RFC2252: alternative servers'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.7 NAME 'supportedExtension'
|
||||
DESC 'RFC2252: supported extended operations'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.13 NAME 'supportedControl'
|
||||
DESC 'RFC2252: supported controls'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.14 NAME 'supportedSASLMechanisms'
|
||||
DESC 'RFC2252: supported SASL mechanisms'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.15 NAME 'supportedLDAPVersion'
|
||||
DESC 'RFC2252: supported LDAP versions'
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.1466.101.120.16 NAME 'ldapSyntaxes'
|
||||
DESC 'RFC2252: LDAP syntaxes'
|
||||
EQUALITY objectIdentifierFirstComponentMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.54 USAGE directoryOperation )
|
||||
|
||||
#
|
||||
# Standard attribute types used for subtyping from RFC 2256
|
||||
#
|
||||
|
||||
attributetype ( 2.5.4.41 NAME 'name'
|
||||
DESC 'RFC2256: common supertype of name attributes'
|
||||
EQUALITY caseIgnoreMatch
|
||||
SUBSTR caseIgnoreSubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )
|
||||
|
||||
attributetype ( 2.5.4.49 NAME 'distinguishedName'
|
||||
DESC 'RFC2256: common supertype of distingushed name attributes'
|
||||
EQUALITY distinguishedNameMatch
|
||||
@ -157,24 +66,27 @@ attributetype ( 2.5.4.49 NAME 'distinguishedName'
|
||||
# Standard attribute types from RFC 2256
|
||||
#
|
||||
|
||||
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.0 NAME 'objectClass'
|
||||
# DESC 'RFC2256: object classes of the entity'
|
||||
# EQUALITY objectIdentifierMatch
|
||||
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
|
||||
|
||||
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 )
|
||||
# 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} )
|
||||
|
||||
attributetype ( 2.5.4.3 NAME ( 'cn' 'commonName' )
|
||||
DESC 'RFC2256: common name(s) for which the entity is known by'
|
||||
SUP name )
|
||||
# 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'
|
||||
@ -330,10 +242,11 @@ attributetype ( 2.5.4.34 NAME 'seeAlso'
|
||||
DESC 'RFC2256: DN of related object'
|
||||
SUP distinguishedName )
|
||||
|
||||
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} )
|
||||
# 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
|
||||
attributetype ( 2.5.4.36 NAME 'userCertificate'
|
||||
@ -696,11 +609,11 @@ objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject'
|
||||
# From draft-zeilenga-ldap-namedref-00.txt
|
||||
# used to represent referrals in the directory
|
||||
#
|
||||
attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref'
|
||||
DESC 'namedref: subordinate referral URL'
|
||||
EQUALITY caseExactMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
|
||||
USAGE distributedOperation )
|
||||
#attributetype ( 2.16.840.1.113730.3.1.34 NAME 'ref'
|
||||
# DESC 'namedref: subordinate referral URL'
|
||||
# EQUALITY caseExactMatch
|
||||
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
|
||||
# USAGE distributedOperation )
|
||||
|
||||
objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
|
||||
DESC 'namedref: named subordinate referral'
|
||||
@ -761,53 +674,13 @@ attributetype ( 1.3.6.1.4.1.250.1.32
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
||||
SINGLE-VALUE )
|
||||
|
||||
#
|
||||
# draft-zeilenga-ldap-features-xx.txt (supportedFeatures)
|
||||
#
|
||||
attributetype ( 1.3.6.1.4.1.4203.1.3.5
|
||||
NAME 'supportedFeatures'
|
||||
DESC 'features supported by the server'
|
||||
EQUALITY objectIdentifierMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
|
||||
USAGE dSAOperation )
|
||||
|
||||
#
|
||||
# LDUP/LCUP attributes
|
||||
# Experimental!
|
||||
#
|
||||
attributetype ( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID'
|
||||
DESC 'LCUP/LDUP: universally unique identifier'
|
||||
EQUALITY octetStringMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64}
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN'
|
||||
DESC 'LCUP/LDUP: change sequence number'
|
||||
EQUALITY octetStringMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64}
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
|
||||
|
||||
#
|
||||
# OpenLDAP specific schema items
|
||||
# Access Control Information
|
||||
#
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.4203.1.3.1
|
||||
NAME 'entry'
|
||||
DESC 'OpenLDAP ACL entry pseudo-attribute'
|
||||
SYNTAX 1.3.6.1.4.1.4203.1.1.1
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
|
||||
|
||||
attributetype ( 1.3.6.1.4.1.4203.1.3.2
|
||||
NAME 'children'
|
||||
DESC 'OpenLDAP ACL children pseudo-attribute'
|
||||
SYNTAX 1.3.6.1.4.1.4203.1.1.1
|
||||
SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
|
||||
|
||||
# OpenLDAP Access Control Information
|
||||
# Experimental
|
||||
attributetype ( 1.3.6.1.4.1.4203.666.1.5
|
||||
NAME 'OpenLDAPaci'
|
||||
DESC 'OpenLDAP access control information (experimental)'
|
||||
EQUALITY OpenLDAPaciMatch
|
||||
SYNTAX 1.3.6.1.4.1.4203.666.2.1
|
||||
USAGE directoryOperation )
|
||||
#attributetype ( 1.3.6.1.4.1.4203.666.1.5
|
||||
# NAME 'OpenLDAPaci'
|
||||
# DESC 'OpenLDAP access control information (experimental)'
|
||||
# EQUALITY OpenLDAPaciMatch
|
||||
# SYNTAX 1.3.6.1.4.1.4203.666.2.1
|
||||
# USAGE directoryOperation )
|
||||
|
||||
@ -218,12 +218,14 @@ parse_at(
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* operational attributes should be defined internally */
|
||||
if ( at->at_usage ) {
|
||||
fprintf( stderr, "%s: line %d: attribute type \"%s\" is operational\n",
|
||||
fname, lineno, at->at_oid );
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
code = at_add(at,&err);
|
||||
if ( code ) {
|
||||
|
||||
@ -44,7 +44,7 @@ SLAPD_OBJS = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
|
||||
../entry.o ../dn.o ../filter.o ../str2filter.o ../ava.o \
|
||||
../init.o ../controls.o ../kerberos.o ../passwd.o \
|
||||
../index.o ../extended.o ../starttls.o ../sets.o ../mra.o \
|
||||
../referral.o ../backglue.o
|
||||
../referral.o ../backglue.o ../oidm.o
|
||||
|
||||
SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user