cleanup bind

[openldap] / servers / slapd / cr.c

diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index f8a79a2bf375961ef98ff5c8e64119606e5750ac..478687863ee4fbb495b5c15d9a2eb3ed7a0d3869 100644 (file)
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -78,6 +78,20 @@ 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 )
 {
@@ -89,11 +103,7 @@ cr_destroy( void )
                c = LDAP_SLIST_FIRST(&cr_list);
                LDAP_SLIST_REMOVE_HEAD(&cr_list, 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);
+               cr_destroy_one( c );
        }
 }
 
@@ -106,6 +116,7 @@ cr_insert(
        struct cindexrec        *cir;
        char                    **names;
 
+       LDAP_SLIST_NEXT( scr, scr_next ) = NULL;
        LDAP_SLIST_INSERT_HEAD(&cr_list, scr, scr_next);
 
        if ( scr->scr_oid ) {
@@ -388,29 +399,40 @@ 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;
+#ifdef SLAP_NVALUES
+       struct berval   nval;
+#endif
 
        LDAP_SLIST_FOREACH(cr, &cr_list, scr_next) {
-               if ( ldap_contentrule2bv( &cr->scr_crule, vals ) == NULL ) {
+               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;