From 3d8c269f2e0f739b2572f9bd4dfdd7eabb7c8a9f Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 19 Jan 2002 22:33:07 +0000 Subject: [PATCH] Update collective attribute schema --- servers/slapd/proto-slap.h | 6 +++--- servers/slapd/schema_check.c | 4 ++-- servers/slapd/schema_prep.c | 14 +++++++------- servers/slapd/slap.h | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index e278a0bd72..a9d733a12d 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -638,9 +638,9 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( #define is_entry_subentry(e) \ (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_SUBENTRY) : \ is_entry_objectclass((e), slap_schema.si_oc_subentry, 1)) -#define is_entry_collectiveAttributes(e) \ - (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_COLLECTIVEATTRIBUTES) : \ - is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributes, 1)) +#define is_entry_collectiveAttributeSubentry(e) \ + (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY) : \ + is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributeSubentry, 1)) #define is_entry_dynamicObject(e) \ (((e)->e_ocflags & SLAP_OC__END) ? ((e)->e_ocflags & SLAP_OC_DYNAMICOBJECT) : \ is_entry_objectclass((e), slap_schema.si_oc_dynamicObject, 1)) diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c index 8e81ea0e35..072460282d 100644 --- a/servers/slapd/schema_check.c +++ b/servers/slapd/schema_check.c @@ -48,7 +48,7 @@ entry_schema_check( int subentry = is_entry_subentry( e ); int collectiveSubentry = 0; - if( subentry) collectiveSubentry = is_entry_collectiveAttributes( e ); + if( subentry) collectiveSubentry = is_entry_collectiveAttributeSubentry( e ); *text = textbuf; @@ -70,7 +70,7 @@ entry_schema_check( if( !collectiveSubentry && is_at_collective( a->a_desc->ad_type ) ) { snprintf( textbuf, textlen, - "'%s' can only appear in collectiveAttributes subentry", + "'%s' can only appear in collectiveAttributeSubentry", type ); return LDAP_OBJECT_CLASS_VIOLATION; } diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index 941f3d428c..6deb5e38f5 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -172,11 +172,11 @@ static struct slap_schema_oc_map { "STRUCTURAL " "MUST cn )", 0, 0, offsetof(struct slap_internal_schema, si_oc_monitor) }, - { "collectiveAttributes", "( 2.5.20.2 " - "NAME 'collectiveAttributes' " + { "collectiveAttributeSubentry", "( 2.5.20.2 " + "NAME 'collectiveAttributeSubentry' " "AUXILIARY )", - subentryObjectClass, SLAP_OC_COLLECTIVEATTRIBUTES, - offsetof(struct slap_internal_schema, si_oc_collectiveAttributes) }, + subentryObjectClass, SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY, + offsetof(struct slap_internal_schema, si_oc_collectiveAttributeSubentry) }, { "dynamicObject", "( 1.3.6.1.4.1.1466.101.119.2 " "NAME 'dynamicObject' " "DESC 'RFC2589: Dynamic Object' " @@ -263,13 +263,13 @@ static struct slap_schema_ad_map { "SINGLE-VALUE USAGE directoryOperation )", NULL, 0, NULL, NULL, NULL, offsetof(struct slap_internal_schema, si_ad_subschemaSubentry) }, - { "collectiveAttributeSubentry", "( 2.5.18.12 " - "NAME 'collectiveAttributeSubentry' " + { "collectiveAttributeSubentries", "( 2.5.18.12 " + "NAME 'collectiveAttributeSubentries' " "EQUALITY distinguishedNameMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 " "USAGE directoryOperation NO-USER-MODIFICATION )", NULL, 0, NULL, NULL, NULL, - offsetof(struct slap_internal_schema, si_ad_collectiveSubentry) }, + offsetof(struct slap_internal_schema, si_ad_collectiveSubentries) }, { "collectiveExclusions", "( 2.5.18.7 NAME 'collectiveExclusions' " "EQUALITY objectIdentifierMatch " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 " diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index de2b8fedab..f0d8dc31a0 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -490,7 +490,7 @@ typedef struct slap_object_class { #define SLAP_OC_REFERRAL 0x02 #define SLAP_OC_SUBENTRY 0x04 #define SLAP_OC_DYNAMICOBJECT 0x08 -#define SLAP_OC_COLLECTIVEATTRIBUTES 0x10 +#define SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY 0x10 #define SLAP_OC__MASK 0x1F #define SLAP_OC__END 0x20 @@ -551,7 +551,7 @@ struct slap_internal_schema { ObjectClass *si_oc_subentry; ObjectClass *si_oc_subschema; ObjectClass *si_oc_monitor; - ObjectClass *si_oc_collectiveAttributes; + ObjectClass *si_oc_collectiveAttributeSubentry; ObjectClass *si_oc_dynamicObject; /* objectClass attribute descriptions */ @@ -565,7 +565,7 @@ struct slap_internal_schema { AttributeDescription *si_ad_modifyTimestamp; AttributeDescription *si_ad_hasSubordinates; AttributeDescription *si_ad_subschemaSubentry; - AttributeDescription *si_ad_collectiveSubentry; + AttributeDescription *si_ad_collectiveSubentries; AttributeDescription *si_ad_collectiveExclusions; AttributeDescription *si_ad_entryUUID; AttributeDescription *si_ad_entryCSN; -- 2.39.5