Add SLAP_MR_ORDERED_INDEX - support for inequality indexing. Currently

[openldap] / servers / slapd / back-meta / modify.c

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index f44290448d1c177afe80edf43b4f10a2964fc343..8071a4141c5d1e97fe7b54c0106b503204e098b8 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -41,7 +41,7 @@ meta_back_modify( Operation *op, SlapReply *rs )
        LDAPMod                 *mods = NULL;
        Modifications           *ml;
        int                     candidate = -1, i;
-       struct berval           mdn = { 0, NULL };
+       struct berval           mdn = BER_BVNULL;
        struct berval           mapped;
        dncookie                dc;
 
@@ -65,7 +65,7 @@ meta_back_modify( Operation *op, SlapReply *rs )
        dc.rwmap = &li->targets[ candidate ]->rwmap;
        dc.conn = op->o_conn;
        dc.rs = rs;
-       dc.ctx = "modifyDn";
+       dc.ctx = "modifyDN";
 
        if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
                rc = -1;
@@ -114,15 +114,15 @@ meta_back_modify( Operation *op, SlapReply *rs )
                 */
                if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid,
                                        SLAPD_DN_SYNTAX ) == 0 ) {
-                       ( void )ldap_dnattr_rewrite( &dc, ml->sml_bvalues );
+                       ( void )ldap_dnattr_rewrite( &dc, ml->sml_values );
                }
 
-               if ( ml->sml_bvalues != NULL ){
-                       for (j = 0; ml->sml_bvalues[ j ].bv_val; j++);
+               if ( ml->sml_values != NULL ){
+                       for (j = 0; ml->sml_values[ j ].bv_val; j++);
                        mods[ i ].mod_bvalues = (struct berval **)ch_malloc((j+1) *
                                sizeof(struct berval *));
-                       for (j = 0; ml->sml_bvalues[ j ].bv_val; j++)
-                               mods[ i ].mod_bvalues[ j ] = &ml->sml_bvalues[j];
+                       for (j = 0; ml->sml_values[ j ].bv_val; j++)
+                               mods[ i ].mod_bvalues[ j ] = &ml->sml_values[j];
                        mods[ i ].mod_bvalues[ j ] = NULL;
 
                } else {