X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcr.c;h=059eddda389e486d183eac0d8f243b112d1cc0b5;hb=3d522a0c9fd79b0275a219bde1f4465b181a9318;hp=f8f5216cb404956f2c4ede68afbb12c9342bac33;hpb=acc32b9d9e731cf51d5f84ef392e9aa0c17e89de;p=openldap
diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index f8f5216cb4..059eddda38 100644
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -1,8 +1,17 @@
/* cr.c - content rule routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 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"
@@ -16,35 +25,36 @@
#include "slap.h"
#include "ldap_pvt.h"
-#ifdef SLAP_EXTENDED_SCHEMA
-
struct cindexrec {
struct berval cir_name;
ContentRule *cir_cr;
};
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(
- struct cindexrec *cir1,
- struct cindexrec *cir2 )
+ const void *v_cir1,
+ const void *v_cir2 )
{
+ const struct cindexrec *cir1 = v_cir1;
+ const struct cindexrec *cir2 = v_cir2;
int i = cir1->cir_name.bv_len - cir2->cir_name.bv_len;
- if (i)
- return i;
+ if (i) return i;
return strcasecmp( cir1->cir_name.bv_val, cir2->cir_name.bv_val );
}
static int
cr_index_name_cmp(
- struct berval *name,
- struct cindexrec *cir )
+ const void *v_name,
+ const void *v_cir )
{
+ const struct berval *name = v_name;
+ const struct cindexrec *cir = v_cir;
int i = name->bv_len - cir->cir_name.bv_len;
- if (i)
- return i;
+ if (i) return i;
return strncasecmp( name->bv_val, cir->cir_name.bv_val, name->bv_len );
}
@@ -64,8 +74,7 @@ cr_bvfind( struct berval *crname )
{
struct cindexrec *cir;
- cir = (struct cindexrec *) avl_find( cr_index, crname,
- (AVL_CMP) cr_index_name_cmp );
+ cir = avl_find( cr_index, crname, cr_index_name_cmp );
if ( cir != NULL ) {
return( cir->cir_cr );
@@ -74,20 +83,32 @@ cr_bvfind( struct berval *crname )
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 );
}
}
@@ -97,15 +118,11 @@ cr_insert(
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 *)
@@ -118,8 +135,7 @@ cr_insert(
assert( cir->cir_cr );
if ( avl_insert( &cr_index, (caddr_t) cir,
- (AVL_CMP) cr_index_cmp,
- (AVL_DUP) avl_dup_error ) )
+ cr_index_cmp, avl_dup_error ) )
{
*err = scr->scr_oid;
ldap_memfree(cir);
@@ -142,8 +158,7 @@ cr_insert(
assert( cir->cir_cr );
if ( avl_insert( &cr_index, (caddr_t) cir,
- (AVL_CMP) cr_index_cmp,
- (AVL_DUP) avl_dup_error ) )
+ cr_index_cmp, avl_dup_error ) )
{
*err = *names;
ldap_memfree(cir);
@@ -184,7 +199,11 @@ cr_add_auxiliaries(
return SLAP_SCHERR_CLASS_NOT_FOUND;
}
- if( soc->soc_flags & SLAP_OC_OPERATIONAL ) (*op)++;
+ if( soc->soc_flags & SLAP_OC_OPERATIONAL &&
+ soc != slap_schema.si_oc_extensibleObject )
+ {
+ (*op)++;
+ }
if( soc->soc_kind != LDAP_SCHEMA_AUXILIARY ) {
*err = scr->scr_oc_oids_aux[naux];
@@ -193,7 +212,6 @@ cr_add_auxiliaries(
}
scr->scr_auxiliaries[naux] = NULL;
-
return 0;
}
@@ -377,41 +395,45 @@ cr_add(
code = cr_create_precluded( scr, &op, err );
if ( code != 0 ) return code;
- if( user && op ) return SLAP_SCHERR_CR_BAD_AUX;
+ if( user && op ) {
+ return SLAP_SCHERR_CR_BAD_AUX;
+ }
code = cr_insert(scr,err);
return code;
}
-#endif
-
int
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;
+ struct berval nval;
- 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
- attr_merge( e, ad_ditContentRules, vals );
- ldap_memfree( vals[0].bv_val );
+
+ nval.bv_val = cr->scr_oid;
+ nval.bv_len = strlen(cr->scr_oid);
+
+ if( attr_merge_one( e, ad_ditContentRules, &val, &nval ) )
+ {
+ return -1;
+ }
+ ldap_memfree( val.bv_val );
}
-#endif
return 0;
}