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 bfb1d5ca3e9e51d42597caa9bd67cc95586557a8..8071a4141c5d1e97fe7b54c0106b503204e098b8 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -1,67 +1,23 @@
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * All rights reserved.
  *
- * This work has been developed to fulfill the requirements
- * of SysNet s.n.c. <http:www.sys-net.it> and it has been donated
- * to the OpenLDAP Foundation in the hope that it may be useful
- * to the Open Source community, but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- *    of use of this software, no matter how awful, even if they arise from 
- *    flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- *    SysNet s.n.c. cannot be responsible for the consequences of the
- *    alterations.
- *
- * 4. This notice may not be removed or altered.
- *
- *
- * This software is based on the backend back-ldap, implemented
- * by Howard Chu <hyc@highlandsun.com>, and modified by Mark Valence
- * <kurash@sassafras.com>, Pierangelo Masarati <ando@sys-net.it> and other
- * contributors. The contribution of the original software to the present
- * implementation is acknowledged in this copyright statement.
- *
- * A special acknowledgement goes to Howard for the overall architecture
- * (and for borrowing large pieces of code), and to Mark, who implemented
- * from scratch the attribute/objectclass mapping.
- *
- * The original copyright statement follows.
- *
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the
- *    documentation.
- *
- * 4. This notice may not be removed or altered.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -85,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;
 
@@ -109,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;
@@ -158,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 {