Commit 75149ee9 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#6983 fix duplicate entry in HDB subtree IDL

parent e3d46f2f
......@@ -945,6 +945,7 @@ hdb_dn2idl_internal(
cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, ids);
if ( cx->rc == LDAP_SUCCESS ) {
if ( cx->depth ) {
bdb_idl_delete( cx->tmp, cx->id ); /* ITS#6983, drop our own ID */
bdb_idl_append( cx->ids, cx->tmp );
cx->need_sort = 1;
}
......
......@@ -219,7 +219,7 @@ int bdb_idl_insert( ID *ids, ID id )
return 0;
}
static int bdb_idl_delete( ID *ids, ID id )
int bdb_idl_delete( ID *ids, ID id )
{
unsigned x;
......
......@@ -281,6 +281,7 @@ bdb_idl_cache_del_id(
#define bdb_idl_next BDB_SYMBOL(idl_next)
#define bdb_idl_search BDB_SYMBOL(idl_search)
#define bdb_idl_insert BDB_SYMBOL(idl_insert)
#define bdb_idl_delete BDB_SYMBOL(idl_delete)
#define bdb_idl_intersection BDB_SYMBOL(idl_intersection)
#define bdb_idl_union BDB_SYMBOL(idl_union)
#define bdb_idl_sort BDB_SYMBOL(idl_sort)
......@@ -303,6 +304,7 @@ int bdb_idl_fetch_key(
int get_flag );
int bdb_idl_insert( ID *ids, ID id );
int bdb_idl_delete( ID *ids, ID id );
int bdb_idl_insert_key(
BackendDB *be,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment