};
static Avlnode *cr_index = NULL;
-static ContentRule *cr_list = NULL;
+static LDAP_SLIST_HEAD(CRList, slap_content_rule) cr_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&cr_list);
static int
cr_index_cmp(
return( NULL );
}
+static int
+cr_destroy_one( ContentRule *c )
+{
+ assert( c != NULL );
+
+ if (c->scr_auxiliaries) ldap_memfree(c->scr_auxiliaries);
+ if (c->scr_required) ldap_memfree(c->scr_required);
+ if (c->scr_allowed) ldap_memfree(c->scr_allowed);
+ if (c->scr_precluded) ldap_memfree(c->scr_precluded);
+ ldap_contentrule_free((LDAPContentRule *)c);
+
+ return 0;
+}
+
void
cr_destroy( void )
{
- ContentRule *c, *n;
+ ContentRule *c;
avl_free(cr_index, ldap_memfree);
- for (c=cr_list; c; c=n)
- {
- n = c->scr_next;
- if (c->scr_auxiliaries) ldap_memfree(c->scr_auxiliaries);
- if (c->scr_required) ldap_memfree(c->scr_required);
- if (c->scr_allowed) ldap_memfree(c->scr_allowed);
- if (c->scr_precluded) ldap_memfree(c->scr_precluded);
- ldap_contentrule_free((LDAPContentRule *)c);
+
+ while( !LDAP_SLIST_EMPTY(&cr_list) ) {
+ c = LDAP_SLIST_FIRST(&cr_list);
+ LDAP_SLIST_REMOVE_HEAD(&cr_list, scr_next);
+
+ cr_destroy_one( c );
}
}
const char **err
)
{
- ContentRule **crp;
struct cindexrec *cir;
char **names;
- crp = &cr_list;
- while ( *crp != NULL ) {
- crp = &(*crp)->scr_next;
- }
- *crp = scr;
+ LDAP_SLIST_NEXT( scr, scr_next ) = NULL;
+ LDAP_SLIST_INSERT_HEAD(&cr_list, scr, scr_next);
if ( scr->scr_oid ) {
cir = (struct cindexrec *)
cr_schema_info( Entry *e )
{
#ifdef SLAP_EXTENDED_SCHEMA
- struct berval vals[2];
+ AttributeDescription *ad_ditContentRules
+ = slap_schema.si_ad_ditContentRules;
ContentRule *cr;
- AttributeDescription *ad_ditContentRules = slap_schema.si_ad_ditContentRules;
-
- vals[1].bv_val = NULL;
+ struct berval val;
+#ifdef SLAP_NVALUES
+ struct berval nval;
+#endif
- for ( cr = cr_list; cr; cr = cr->scr_next ) {
- if ( ldap_contentrule2bv( &cr->scr_crule, vals ) == NULL ) {
+ LDAP_SLIST_FOREACH(cr, &cr_list, scr_next) {
+ if ( ldap_contentrule2bv( &cr->scr_crule, &val ) == NULL ) {
return -1;
}
#if 0
if( cr->scr_flags & SLAP_CR_HIDE ) continue;
#endif
-
#if 0
Debug( LDAP_DEBUG_TRACE, "Merging cr [%ld] %s\n",
- (long) vals[0].bv_len, vals[0].bv_val, 0 );
+ (long) val.bv_len, val.bv_val, 0 );
#endif
- if( attr_merge( e, ad_ditContentRules, vals ) )
+
+#ifdef SLAP_NVALUES
+ nval.bv_val = cr->scr_oid;
+ nval.bv_len = strlen(cr->scr_oid);
+
+ if( attr_merge_one( e, ad_ditContentRules, &val, &nval ) )
+#else
+ if( attr_merge_one( e, ad_ditContentRules, &val ) )
+#endif
+ {
return -1;
- ldap_memfree( vals[0].bv_val );
+ }
+ ldap_memfree( val.bv_val );
}
#endif
return 0;