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 ad00a1ece3497a41ae2ba1b21c6a1d5baf0aa24b..0a7fe04f4a3e57ffbf23d2b6632172f6ea47ae03 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -97,6 +97,7 @@ mr_insert(
        struct mindexrec        *mir;
        char                    **names;
 
+       LDAP_SLIST_NEXT( smr, smr_next ) = NULL;
        LDAP_SLIST_INSERT_HEAD(&mr_list, smr, smr_next);
 
        if ( smr->smr_oid ) {
@@ -177,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;
@@ -437,9 +440,11 @@ 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
 
        LDAP_SLIST_FOREACH(mr, &mr_list, smr_next ) {
                if ( mr->smr_usage & SLAP_MR_HIDE ) {
@@ -461,18 +466,28 @@ 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
 
        LDAP_SLIST_FOREACH( mru, &mru_list, smru_next ) {
 
@@ -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;
 }