Fix ITS#3424

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index d4f6b6b914eb0457ab28027e8b5cf419af281110..4b392247836ca4f5a5e3a283bef7c81b42a7ec23 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -30,7 +30,6 @@
 #include <ac/time.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
@@ -147,8 +146,8 @@ do_add( Operation *op, SlapReply *rs )
                goto done;
        }
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
-           op->o_connid, op->o_opid, e->e_name.bv_val, 0, 0 );
+       Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
+           op->o_log_prefix, e->e_name.bv_val, 0, 0, 0 );
 
        if( e->e_nname.bv_len == 0 ) {
                /* protocolError may be a more appropriate error */
@@ -202,7 +201,7 @@ fe_op_add( Operation *op, SlapReply *rs )
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
+       op->o_bd = select_backend( &e->e_nname, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
@@ -311,6 +310,7 @@ fe_op_add( Operation *op, SlapReply *rs )
                                be_entry_release_w( op, e );
                                e = NULL;
                        }
+                       op->ora_e = NULL;
 
 #ifndef SLAPD_MULTIMASTER
                } else {
@@ -422,24 +422,32 @@ slap_mods2entry(
 
                        /* should check for duplicates */
 
-                       AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
-                               sizeof( struct berval ) * j );
-
-                       /* trim the mods array */
-                       ch_free( mods->sml_values );
-                       mods->sml_values = NULL;
+                       if ( dup ) {
+                               for ( j = 0; mods->sml_values[j].bv_val; j++ ) {
+                                       ber_dupbv( &attr->a_vals[i+j], &mods->sml_values[j] );
+                               }
+                               BER_BVZERO( &attr->a_vals[i+j] );       
+                       } else {
+                               AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
+                                       sizeof( struct berval ) * j );
+                               ch_free( mods->sml_values );
+                               mods->sml_values = NULL;
+                       }
 
                        if( mods->sml_nvalues ) {
                                attr->a_nvals = ch_realloc( attr->a_nvals,
                                        sizeof( struct berval ) * (i+j) );
-
-                               AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
-                                       sizeof( struct berval ) * j );
-
-                               /* trim the mods array */
-                               ch_free( mods->sml_nvalues );
-                               mods->sml_nvalues = NULL;
-
+                               if ( dup ) {
+                                       for ( j = 0; mods->sml_nvalues[j].bv_val; j++ ) {
+                                               ber_dupbv( &attr->a_nvals[i+j], &mods->sml_nvalues[j] );
+                                       }
+                                       BER_BVZERO( &attr->a_nvals[i+j] );      
+                               } else {
+                                       AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
+                                               sizeof( struct berval ) * j );
+                                       ch_free( mods->sml_nvalues );
+                                       mods->sml_nvalues = NULL;
+                               }
                        } else {
                                attr->a_nvals = attr->a_vals;
                        }