/* cr.c - content rule routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
#include <ac/socket.h>
#include "slap.h"
-#include "ldap_pvt.h"
-
-#ifdef SLAP_EXTENDED_SCHEMA
struct cindexrec {
struct berval cir_name;
};
static Avlnode *cr_index = NULL;
-static LDAP_SLIST_HEAD(CRList, slap_content_rule) cr_list
- = LDAP_SLIST_HEAD_INITIALIZER(&cr_list);
+static LDAP_STAILQ_HEAD(CRList, slap_content_rule) cr_list
+ = LDAP_STAILQ_HEAD_INITIALIZER(cr_list);
static int
cr_index_cmp(
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 );
}
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 );
}
avl_free(cr_index, ldap_memfree);
- while( !LDAP_SLIST_EMPTY(&cr_list) ) {
- c = LDAP_SLIST_FIRST(&cr_list);
- LDAP_SLIST_REMOVE_HEAD(&cr_list, scr_next);
+ while( !LDAP_STAILQ_EMPTY(&cr_list) ) {
+ c = LDAP_STAILQ_FIRST(&cr_list);
+ LDAP_STAILQ_REMOVE_HEAD(&cr_list, scr_next);
cr_destroy_one( c );
}
struct cindexrec *cir;
char **names;
- LDAP_SLIST_INSERT_HEAD(&cr_list, scr, scr_next);
-
if ( scr->scr_oid ) {
cir = (struct cindexrec *)
ch_calloc( 1, sizeof(struct cindexrec) );
}
}
+ LDAP_STAILQ_INSERT_TAIL(&cr_list, scr, scr_next);
+
return 0;
}
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];
}
scr->scr_auxiliaries[naux] = NULL;
-
return 0;
}
cr_add(
LDAPContentRule *cr,
int user,
+ ContentRule **rscr,
const char **err
)
{
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);
+ if ( code == 0 && rscr )
+ *rscr = scr;
return code;
}
-#endif
+void
+cr_unparse( BerVarray *res, ContentRule *start, ContentRule *end, int sys )
+{
+ ContentRule *cr;
+ int i, num;
+ struct berval bv, *bva = NULL, idx;
+ char ibuf[32], *ptr;
+
+ if ( !start )
+ start = LDAP_STAILQ_FIRST( &cr_list );
+
+ /* count the result size */
+ i = 0;
+ for ( cr=start; cr; cr=LDAP_STAILQ_NEXT(cr, scr_next)) {
+ if ( sys && !(cr->scr_flags & SLAP_CR_HARDCODE)) continue;
+ i++;
+ if ( cr == end ) break;
+ }
+ if (!i) return;
+
+ num = i;
+ bva = ch_malloc( (num+1) * sizeof(struct berval) );
+ BER_BVZERO( bva );
+ idx.bv_val = ibuf;
+ if ( sys ) {
+ idx.bv_len = 0;
+ ibuf[0] = '\0';
+ }
+ i = 0;
+ for ( cr=start; cr; cr=LDAP_STAILQ_NEXT(cr, scr_next)) {
+ if ( sys && !(cr->scr_flags & SLAP_CR_HARDCODE)) continue;
+ if ( ldap_contentrule2bv( &cr->scr_crule, &bv ) == NULL ) {
+ ber_bvarray_free( bva );
+ }
+ if ( !sys ) {
+ idx.bv_len = sprintf(idx.bv_val, "{%02d}", i);
+ }
+ bva[i].bv_len = idx.bv_len + bv.bv_len;
+ bva[i].bv_val = ch_malloc( bva[i].bv_len + 1 );
+ strcpy( bva[i].bv_val, ibuf );
+ strcpy( bva[i].bv_val + idx.bv_len, bv.bv_val );
+ i++;
+ bva[i].bv_val = NULL;
+ ldap_memfree( bv.bv_val );
+ if ( cr == end ) break;
+ }
+ *res = bva;
+}
int
cr_schema_info( Entry *e )
{
-#ifdef SLAP_EXTENDED_SCHEMA
- struct berval vals[2];
- ContentRule *cr;
-
AttributeDescription *ad_ditContentRules
= slap_schema.si_ad_ditContentRules;
+ ContentRule *cr;
- vals[1].bv_val = NULL;
+ struct berval val;
+ struct berval nval;
- LDAP_SLIST_FOREACH(cr, &cr_list, scr_next) {
- if ( ldap_contentrule2bv( &cr->scr_crule, vals ) == NULL ) {
+ LDAP_STAILQ_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 );
-#endif
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_ditContentRules, vals, NULL ) )
-#else
- if( attr_merge( e, ad_ditContentRules, vals ) )
+ (long) val.bv_len, val.bv_val, 0 );
#endif
+
+ 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( vals[0].bv_val );
+ ldap_memfree( val.bv_val );
}
-#endif
return 0;
}
projects / openldap / blobdiff