X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=b31defeaef19610d784a8d705591721c062bae33;hb=ee66a01b8c7dc0c1bd7838c0f6137fad03595ad1;hp=75aabb9d62235ae329c7cd5844c3a415d7c5e149;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap
diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 75aabb9d62..b31defeaef 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,8 +1,17 @@
/* oc.c - object class routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -24,15 +33,9 @@ int is_object_subclass(
if( sub == NULL || sup == NULL ) return 0;
-#if 1
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ARGS,
- "is_object_subclass(%s,%s) %d\n",
- sup->soc_oid, sub->soc_oid, sup == sub );
-#else
+#if 0
Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
sup->soc_oid, sub->soc_oid, sup == sub );
-#endif
#endif
if( sup == sub ) {
@@ -75,7 +78,7 @@ int is_entry_objectclass(
if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
/* flags are set, use them */
- return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
+ return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0;
}
/*
@@ -84,17 +87,10 @@ int is_entry_objectclass(
attr = attr_find(e->e_attrs, objectClass);
if( attr == NULL ) {
/* no objectClass attribute */
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "is_entry_objectclass: dn(%s), oid (%s), no objectClass "
- "attribute.\n", e->e_dn == NULL ? "" : e->e_dn,
- oc->soc_oclass.oc_oid, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
"no objectClass attribute\n",
e->e_dn == NULL ? "" : e->e_dn,
oc->soc_oclass.oc_oid, 0 );
-#endif
return 0;
}
@@ -114,17 +110,18 @@ int is_entry_objectclass(
/* mark flags as set */
e->e_ocflags |= SLAP_OC__END;
- return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
+ return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0;
}
struct oindexrec {
- struct berval oir_name;
+ struct berval oir_name;
ObjectClass *oir_oc;
};
static Avlnode *oc_index = NULL;
-static ObjectClass *oc_list = NULL;
+static LDAP_SLIST_HEAD(OCList, slap_object_class) oc_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&oc_list);
static int
oc_index_cmp(
@@ -133,8 +130,7 @@ oc_index_cmp(
{
const struct oindexrec *oir1 = v_oir1, *oir2 = v_oir2;
int i = oir1->oir_name.bv_len - oir2->oir_name.bv_len;
- if (i)
- return i;
+ if (i) return i;
return strcasecmp( oir1->oir_name.bv_val, oir2->oir_name.bv_val );
}
@@ -146,8 +142,7 @@ oc_index_name_cmp(
const struct berval *name = v_name;
const struct oindexrec *oir = v_oir;
int i = name->bv_len - oir->oir_name.bv_len;
- if (i)
- return i;
+ if (i) return i;
return strncasecmp( name->bv_val, oir->oir_name.bv_val, name->bv_len );
}
@@ -331,12 +326,13 @@ oc_add_sups(
void
oc_destroy( void )
{
- ObjectClass *o, *n;
+ ObjectClass *o;
avl_free(oc_index, ldap_memfree);
- for (o=oc_list; o; o=n)
- {
- n = o->soc_next;
+ while( !LDAP_SLIST_EMPTY(&oc_list) ) {
+ o = LDAP_SLIST_FIRST(&oc_list);
+ LDAP_SLIST_REMOVE_HEAD(&oc_list, soc_next);
+
if (o->soc_sups) ldap_memfree(o->soc_sups);
if (o->soc_required) ldap_memfree(o->soc_required);
if (o->soc_allowed) ldap_memfree(o->soc_allowed);
@@ -347,18 +343,13 @@ oc_destroy( void )
static int
oc_insert(
ObjectClass *soc,
- const char **err
-)
+ const char **err )
{
- ObjectClass **ocp;
struct oindexrec *oir;
char **names;
- ocp = &oc_list;
- while ( *ocp != NULL ) {
- ocp = &(*ocp)->soc_next;
- }
- *ocp = soc;
+ LDAP_SLIST_NEXT( soc, soc_next ) = NULL;
+ LDAP_SLIST_INSERT_HEAD( &oc_list, soc, soc_next );
if ( soc->soc_oid ) {
oir = (struct oindexrec *)
@@ -371,7 +362,7 @@ oc_insert(
assert( oir->oir_oc );
if ( avl_insert( &oc_index, (caddr_t) oir,
- oc_index_cmp, avl_dup_error ) )
+ oc_index_cmp, avl_dup_error ) )
{
*err = soc->soc_oid;
ldap_memfree(oir);
@@ -394,7 +385,7 @@ oc_insert(
assert( oir->oir_oc );
if ( avl_insert( &oc_index, (caddr_t) oir,
- oc_index_cmp, avl_dup_error ) )
+ oc_index_cmp, avl_dup_error ) )
{
*err = *names;
ldap_memfree(oir);
@@ -415,8 +406,7 @@ int
oc_add(
LDAPObjectClass *oc,
int user,
- const char **err
-)
+ const char **err )
{
ObjectClass *soc;
int code;
@@ -466,6 +456,7 @@ oc_add(
}
if ( code != 0 ) return code;
+ if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
if ( code != 0 ) return code;
@@ -473,7 +464,7 @@ oc_add(
code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
if ( code != 0 ) return code;
- if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+ if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
code = oc_insert(soc,err);
return code;
@@ -482,27 +473,29 @@ oc_add(
int
oc_schema_info( Entry *e )
{
- struct berval vals[2];
- ObjectClass *oc;
-
AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
+ ObjectClass *oc;
+ struct berval val;
+ struct berval nval;
- vals[1].bv_val = NULL;
-
- for ( oc = oc_list; oc; oc = oc->soc_next ) {
+ LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
if( oc->soc_flags & SLAP_OC_HIDE ) continue;
- if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
+ if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {
return -1;
}
+ nval = oc->soc_cname;
+
#if 0
- Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
- (long) vals[0].bv_len, vals[0].bv_val, 0 );
+ Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s (%s)\n",
+ (long) val.bv_len, val.bv_val, nval.bv_val );
#endif
- if( attr_merge( e, ad_objectClasses, vals ) )
+
+ if( attr_merge_one( e, ad_objectClasses, &val, &nval ) ) {
return -1;
- ldap_memfree( vals[0].bv_val );
+ }
+ ldap_memfree( val.bv_val );
}
return 0;
}