Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 2561152d0b54e7557ee0d7d34094f114ea4c2beb..1dcc082833f118e1e9fa69388e449a0b75700ba3 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -531,7 +531,7 @@ slap_entry2mods(
 
        while ( a_new != NULL ) {
                a_new_desc = a_new->a_desc;
-               mod = (Modifications *) malloc( sizeof( Modifications ));
+               mod = (Modifications *) ch_malloc( sizeof( Modifications ));
                
                mod->sml_op = LDAP_MOD_REPLACE;
                mod->sml_flags = 0;
@@ -541,7 +541,7 @@ slap_entry2mods(
                count = a_new->a_numvals;
                mod->sml_numvals = a_new->a_numvals;
 
-               mod->sml_values = (struct berval*) malloc(
+               mod->sml_values = (struct berval*) ch_malloc(
                        (count+1) * sizeof( struct berval) );
 
                /* see slap_mods_check() comments...
@@ -549,7 +549,7 @@ slap_entry2mods(
                 * in this case, mod->sml_nvalues must be left NULL.
                 */
                if ( a_new->a_vals != a_new->a_nvals ) {
-                       mod->sml_nvalues = (struct berval*) malloc(
+                       mod->sml_nvalues = (struct berval*) ch_malloc(
                                (count+1) * sizeof( struct berval) );
                } else {
                        mod->sml_nvalues = NULL;