ITS#6932: Clean up strange asserts & nearby code.

[openldap] / servers / slapd / cr.c

diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index 059eddda389e486d183eac0d8f243b112d1cc0b5..1e75a66fa290a264b23b9c1e12b2bbef03d8a703 100644 (file)
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
 struct cindexrec {
        struct berval   cir_name;
@@ -31,8 +30,8 @@ struct cindexrec {
 };
 
 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, ContentRule) cr_list
+       = LDAP_STAILQ_HEAD_INITIALIZER(cr_list);
 
 static int
 cr_index_cmp(
@@ -104,9 +103,9 @@ cr_destroy( void )
 
        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 );
        }
@@ -121,8 +120,7 @@ cr_insert(
        struct cindexrec        *cir;
        char                    **names;
 
-       LDAP_SLIST_NEXT( scr, scr_next ) = NULL;
-       LDAP_SLIST_INSERT_HEAD(&cr_list, scr, scr_next);
+       assert( scr != NULL );
 
        if ( scr->scr_oid ) {
                cir = (struct cindexrec *)
@@ -131,9 +129,6 @@ cr_insert(
                cir->cir_name.bv_len = strlen( scr->scr_oid );
                cir->cir_cr = scr;
 
-               assert( cir->cir_name.bv_val );
-               assert( cir->cir_cr );
-
                if ( avl_insert( &cr_index, (caddr_t) cir,
                                 cr_index_cmp, avl_dup_error ) )
                {
@@ -154,9 +149,6 @@ cr_insert(
                        cir->cir_name.bv_len = strlen( *names );
                        cir->cir_cr = scr;
 
-                       assert( cir->cir_name.bv_val );
-                       assert( cir->cir_cr );
-
                        if ( avl_insert( &cr_index, (caddr_t) cir,
                                         cr_index_cmp, avl_dup_error ) )
                        {
@@ -172,6 +164,8 @@ cr_insert(
                }
        }
 
+       LDAP_STAILQ_INSERT_TAIL(&cr_list, scr, scr_next);
+
        return 0;
 }
 
@@ -335,12 +329,14 @@ int
 cr_add(
     LDAPContentRule    *cr,
        int user,
+       ContentRule **rscr,
     const char         **err
 )
 {
        ContentRule     *scr;
        int             code;
        int             op = 0;
+       char    *oidm = NULL;
 
        if ( cr->cr_names != NULL ) {
                int i;
@@ -360,7 +356,7 @@ cr_add(
                        return SLAP_SCHERR_OIDM;
                }
                if ( oid != cr->cr_oid ) {
-                       ldap_memfree( cr->cr_oid );
+                       oidm = cr->cr_oid;
                        cr->cr_oid = oid;
                }
        }
@@ -368,41 +364,107 @@ cr_add(
        scr = (ContentRule *) ch_calloc( 1, sizeof(ContentRule) );
        AC_MEMCPY( &scr->scr_crule, cr, sizeof(LDAPContentRule) );
 
+       scr->scr_oidmacro = oidm;
        scr->scr_sclass = oc_find(cr->cr_oid);
        if ( !scr->scr_sclass ) {
                *err = cr->cr_oid;
-               return SLAP_SCHERR_CLASS_NOT_FOUND;
+               code = SLAP_SCHERR_CLASS_NOT_FOUND;
+               goto fail;
        }
 
        /* check object class usage */
        if( scr->scr_sclass->soc_kind != LDAP_SCHEMA_STRUCTURAL )
        {
                *err = cr->cr_oid;
-               return SLAP_SCHERR_CR_BAD_STRUCT;
+               code = SLAP_SCHERR_CR_BAD_STRUCT;
+               goto fail;
        }
 
        if( scr->scr_sclass->soc_flags & SLAP_OC_OPERATIONAL ) op++;
 
        code = cr_add_auxiliaries( scr, &op, err );
-       if ( code != 0 ) return code;
+       if ( code != 0 ) goto fail;
 
        code = cr_create_required( scr, &op, err );
-       if ( code != 0 ) return code;
+       if ( code != 0 ) goto fail;
 
        code = cr_create_allowed( scr, &op, err );
-       if ( code != 0 ) return code;
+       if ( code != 0 ) goto fail;
 
        code = cr_create_precluded( scr, &op, err );
-       if ( code != 0 ) return code;
+       if ( code != 0 ) goto fail;
 
        if( user && op ) {
-               return SLAP_SCHERR_CR_BAD_AUX;
+               code = SLAP_SCHERR_CR_BAD_AUX;
+               goto fail;
        }
 
        code = cr_insert(scr,err);
+       if ( code == 0 && rscr )
+               *rscr = scr;
+       return code;
+fail:
+       ch_free( scr );
        return code;
 }
 
+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];
+
+       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)) {
+               LDAPContentRule lcr, *lcrp;
+               if ( sys && !(cr->scr_flags & SLAP_CR_HARDCODE)) continue;
+               if ( cr->scr_oidmacro ) {
+                       lcr = cr->scr_crule;
+                       lcr.cr_oid = cr->scr_oidmacro;
+                       lcrp = &lcr;
+               } else {
+                       lcrp = &cr->scr_crule;
+               }
+               if ( ldap_contentrule2bv( lcrp, &bv ) == NULL ) {
+                       ber_bvarray_free( bva );
+               }
+               if ( !sys ) {
+                       idx.bv_len = sprintf(idx.bv_val, "{%d}", 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 )
 {
@@ -413,7 +475,7 @@ cr_schema_info( Entry *e )
        struct berval   val;
        struct berval   nval;
 
-       LDAP_SLIST_FOREACH(cr, &cr_list, scr_next) {
+       LDAP_STAILQ_FOREACH(cr, &cr_list, scr_next) {
                if ( ldap_contentrule2bv( &cr->scr_crule, &val ) == NULL ) {
                        return -1;
                }