Merge remote 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 b3be45ceb1ec4bdd64c8e4e26c2de032aced9c7f..f3a9a02da6ca7ba3344bdb8494dcedbeb879c339 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-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2012 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;
@@ -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 ) ) {