Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 2561152d0b54e7557ee0d7d34094f114ea4c2beb..41ae59cf180ce4d90f13d3754721c4221f92bc12 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-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -500,9 +500,6 @@ slap_mods2entry(
                } else {
                        attr->a_nvals = attr->a_vals;
                }
-               /* slap_mods_check() gives us sorted results */
-               if ( attr->a_desc->ad_type->sat_flags & SLAP_AT_SORTED_VAL )
-                       attr->a_flags |= SLAP_ATTR_SORTED_VALS;
 
                *tail = attr;
                tail = &attr->a_next;
@@ -531,7 +528,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 +538,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 +546,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;
@@ -592,7 +589,7 @@ int slap_add_opattrs(
        struct berval name, timestamp, csn = BER_BVNULL;
        struct berval nname, tmp;
        char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+       char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
        Attribute *a;
 
        if ( SLAP_LASTMOD( op->o_bd ) ) {