mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7090 fix out-of-order slapadd

Browse Source
This commit is contained in:
Howard Chu 2011-11-25 00:23:51 -08:00
parent 26dc16e9f6
commit 2c4d548206
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/back-mdb/id2entry.c
View File

@ -35,6 +35,8 @@ static int mdb_entry_encode(Operation *op, Entry *e, MDB_val *data,
Ecount *ec);
static Entry *mdb_entry_alloc( Operation *op, int nattrs, int nvals );
#define ADD_FLAGS (MDB_NOOVERWRITE|MDB_APPEND)
static int mdb_id2entry_put(
Operation *op,
MDB_txn *txn,
@ -72,7 +74,7 @@ again:
if (rc) {
/* Was there a hole from slapadd? */
if ( (flag & MDB_NOOVERWRITE) && data.mv_size == 0 ) {
flag ^= MDB_NOOVERWRITE;
flag ^= ADD_FLAGS;
goto again;
}
Debug( LDAP_DEBUG_ANY,
@ -97,7 +99,7 @@ int mdb_id2entry_add(
MDB_cursor *mc,
Entry *e )
{
return mdb_id2entry_put(op, txn, mc, e, MDB_NOOVERWRITE|MDB_APPEND);
return mdb_id2entry_put(op, txn, mc, e, ADD_FLAGS);
}
int mdb_id2entry_update(