Commit of the Proxy Cache contribution (ITS#2062)

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 146e23b0637480a36bab435077e975f48c4b8364..0a7fe04f4a3e57ffbf23d2b6632172f6ea47ae03 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -22,8 +22,10 @@ struct mindexrec {
 };
 
 static Avlnode *mr_index = NULL;
-static MatchingRule *mr_list = NULL;
-static MatchingRuleUse *mru_list = NULL;
+static LDAP_SLIST_HEAD(MRList, slap_matching_rule) mr_list
+       = LDAP_SLIST_HEAD_INITIALIZER(&mr_list);
+static LDAP_SLIST_HEAD(MRUList, slap_matching_rule_use) mru_list
+       = LDAP_SLIST_HEAD_INITIALIZER(&mru_list);
 
 static int
 mr_index_cmp(
@@ -75,11 +77,12 @@ mr_bvfind( struct berval *mrname )
 void
 mr_destroy( void )
 {
-       MatchingRule *m, *n;
+       MatchingRule *m;
 
        avl_free(mr_index, ldap_memfree);
-       for (m=mr_list; m; m=n) {
-               n = m->smr_next;
+       while( !LDAP_SLIST_EMPTY(&mr_list) ) {
+               m = LDAP_SLIST_FIRST(&mr_list);
+               LDAP_SLIST_REMOVE_HEAD(&mr_list, smr_next);
                ch_free( m->smr_str.bv_val );
                ldap_matchingrule_free((LDAPMatchingRule *)m);
        }
@@ -91,15 +94,11 @@ mr_insert(
     const char         **err
 )
 {
-       MatchingRule            **mrp;
        struct mindexrec        *mir;
        char                    **names;
 
-       mrp = &mr_list;
-       while ( *mrp != NULL ) {
-               mrp = &(*mrp)->smr_next;
-       }
-       *mrp = smr;
+       LDAP_SLIST_NEXT( smr, smr_next ) = NULL;
+       LDAP_SLIST_INSERT_HEAD(&mr_list, smr, smr_next);
 
        if ( smr->smr_oid ) {
                mir = (struct mindexrec *)
@@ -179,9 +178,11 @@ mr_add(
        smr->smr_oidlen = strlen( mr->mr_oid );
        smr->smr_usage = def->mrd_usage;
        smr->smr_compat_syntaxes = compat_syn;
-       smr->smr_convert = def->mrd_convert;
        smr->smr_normalize = def->mrd_normalize;
        smr->smr_match = def->mrd_match;
+#ifndef SLAP_NVALUES
+       smr->smr_convert = def->mrd_convert;
+#endif
        smr->smr_indexer = def->mrd_indexer;
        smr->smr_filter = def->mrd_filter;
        smr->smr_associated = amr;
@@ -287,10 +288,12 @@ register_matching_rule(
 void
 mru_destroy( void )
 {
-       MatchingRuleUse *m, *n;
+       MatchingRuleUse *m;
+
+       while( !LDAP_SLIST_EMPTY(&mru_list) ) {
+               m = LDAP_SLIST_FIRST(&mru_list);
+               LDAP_SLIST_REMOVE_HEAD(&mru_list, smru_next);
 
-       for (m=mru_list; m; m=n) {
-               n = m->smru_next;
                if ( m->smru_str.bv_val ) {
                        ch_free( m->smru_str.bv_val );
                }
@@ -309,7 +312,7 @@ int
 matching_rule_use_init( void )
 {
        MatchingRule    *mr;
-       MatchingRuleUse **mru_ptr = &mru_list;
+       MatchingRuleUse **mru_ptr = &LDAP_SLIST_FIRST(&mru_list);
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, INFO, "matching_rule_use_init\n", 0, 0, 0 );
@@ -317,9 +320,9 @@ matching_rule_use_init( void )
        Debug( LDAP_DEBUG_TRACE, "matching_rule_use_init\n", 0, 0, 0 );
 #endif
 
-       for ( mr = mr_list; mr; mr = mr->smr_next ) {
+       LDAP_SLIST_FOREACH( mr, &mr_list, smr_next ) {
                AttributeType   *at;
-               MatchingRuleUse _mru, *mru = &_mru;
+               MatchingRuleUse mru_storage, *mru = &mru_storage;
 
                char            **applies_oids = NULL;
 
@@ -353,7 +356,7 @@ matching_rule_use_init( void )
                mru->smru_mr = mr;
                mru->smru_obsolete = mr->smr_obsolete;
                mru->smru_applies_oids = NULL;
-               mru->smru_next = NULL;
+               LDAP_SLIST_NEXT(mru, smru_next) = NULL;
                mru->smru_oid = mr->smr_oid;
                mru->smru_names = mr->smr_names;
                mru->smru_desc = mr->smr_desc;
@@ -402,11 +405,11 @@ matching_rule_use_init( void )
                        /* call-forward from MatchingRule to MatchingRuleUse */
                        mr->smr_mru = mru;
                        /* copy static data to newly allocated struct */
-                       *mru = _mru;
+                       *mru = mru_storage;
                        /* append the struct pointer to the end of the list */
                        *mru_ptr = mru;
                        /* update the list head pointer */
-                       mru_ptr = &mru->smru_next;
+                       mru_ptr = &LDAP_SLIST_NEXT(mru,smru_next);
                }
        }
 
@@ -437,11 +440,13 @@ int mr_usable_with_at(
 
 int mr_schema_info( Entry *e )
 {
-       MatchingRule    *mr;
-
        AttributeDescription *ad_matchingRules = slap_schema.si_ad_matchingRules;
+       MatchingRule *mr;
+#ifdef SLAP_NVALUES
+       struct berval nval;
+#endif
 
-       for ( mr = mr_list; mr; mr = mr->smr_next ) {
+       LDAP_SLIST_FOREACH(mr, &mr_list, smr_next ) {
                if ( mr->smr_usage & SLAP_MR_HIDE ) {
                        /* skip hidden rules */
                        continue;
@@ -461,20 +466,30 @@ int mr_schema_info( Entry *e )
                Debug( LDAP_DEBUG_TRACE, "Merging mr [%lu] %s\n",
                        mr->smr_str.bv_len, mr->smr_str.bv_val, 0 );
 #endif
+#ifdef SLAP_NVALUES
+               nval.bv_val = mr->smr_oid;
+               nval.bv_len = strlen(mr->smr_oid);
+               if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) )
+#else
                if( attr_merge_one( e, ad_matchingRules, &mr->smr_str ) )
+#endif
+               {
                        return -1;
+               }
        }
        return 0;
 }
 
 int mru_schema_info( Entry *e )
 {
-       MatchingRuleUse *mru;
-
        AttributeDescription *ad_matchingRuleUse 
                = slap_schema.si_ad_matchingRuleUse;
+       MatchingRuleUse *mru;
+#ifdef SLAP_NVALUES
+       struct berval nval;
+#endif
 
-       for ( mru = mru_list; mru; mru = mru->smru_next ) {
+       LDAP_SLIST_FOREACH( mru, &mru_list, smru_next ) {
 
                assert( !( mru->smru_usage & SLAP_MR_HIDE ) );
 
@@ -489,8 +504,16 @@ int mru_schema_info( Entry *e )
                Debug( LDAP_DEBUG_TRACE, "Merging mru [%lu] %s\n",
                        mru->smru_str.bv_len, mru->smru_str.bv_val, 0 );
 #endif
+#ifdef SLAP_NVALUES
+               nval.bv_val = mru->smru_oid;
+               nval.bv_len = strlen(mru->smru_oid);
+               if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) )
+#else
                if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str ) )
+#endif
+               {
                        return -1;
+               }
        }
        return 0;
 }