mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ocflags tests

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-01-02 23:55:37 +00:00
parent be0d59dbf5
commit 8f0dc1a4a3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
servers/slapd/oc.c
View File

@ -57,9 +57,16 @@ int is_entry_objectclass(
ObjectClass *oc, ObjectClass *oc,
int set_flags ) int set_flags )
{ {
/*
* set_flags should only be true if oc is one of operational
* object classes which we support objectClass flags for
* (e.g., referral, alias, ...). See <slap.h>.
*/
Attribute *attr; Attribute *attr;
struct berval *bv; struct berval *bv;
AttributeDescription *objectClass = slap_schema.si_ad_objectClass; AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
assert(!( e == NULL || oc == NULL )); assert(!( e == NULL || oc == NULL ));
if( e == NULL || oc == NULL ) { if( e == NULL || oc == NULL ) {
@ -67,14 +74,14 @@ int is_entry_objectclass(
} }
if( set_flags && ( e->e_ocflags & SLAP_OC__END )) { if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
return (e->e_ocflags & oc->soc_flags) == oc->soc_flags; /* flags are set, use them */
return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
} }
/* /*
* find objectClass attribute * find objectClass attribute
*/ */
attr = attr_find(e->e_attrs, objectClass); attr = attr_find(e->e_attrs, objectClass);
if( attr == NULL ) { if( attr == NULL ) {
/* no objectClass attribute */ /* no objectClass attribute */
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -95,7 +102,7 @@ int is_entry_objectclass(
for( bv=attr->a_vals; bv->bv_val; bv++ ) { for( bv=attr->a_vals; bv->bv_val; bv++ ) {
ObjectClass *objectClass = oc_bvfind( bv ); ObjectClass *objectClass = oc_bvfind( bv );
if ( objectClass == oc && !set_flags ) { if ( !set_flags && objectClass == oc ) {
return 1; return 1;
} }
@ -103,9 +110,11 @@ int is_entry_objectclass(
e->e_ocflags |= objectClass->soc_flags; e->e_ocflags |= objectClass->soc_flags;
} }
} }
e->e_ocflags |= SLAP_OC__END; /* We've finished this */
return (e->e_ocflags & oc->soc_flags) == oc->soc_flags; /* mark flags as set */
e->e_ocflags |= SLAP_OC__END;
return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
} }