ITS#2974 fix from HEAD

This commit is contained in:
Howard Chu 2004-03-02 23:14:25 +00:00
parent 08ed9aca56
commit 79eced19a3

View file

@ -148,6 +148,7 @@ int bdb_tool_next_id(
dnParent( &dn, &pdn );
e->e_nname = pdn;
rc = bdb_tool_next_id( be, tid, e, text, 1 );
e->e_nname = dn;
if ( rc ) {
return rc;
}
@ -166,7 +167,6 @@ int bdb_tool_next_id(
#endif
return rc;
}
e->e_nname = dn;
rc = bdb_dn2id_add( be, tid, &pdn, e );
if ( rc ) {
snprintf( text->bv_val, text->bv_len,
@ -182,10 +182,10 @@ int bdb_tool_next_id(
} else if ( hole ) {
if ( nholes == nhmax - 1 ) {
if ( holes == hbuf ) {
holes = ch_malloc( nhmax * sizeof(ID) * 2 );
holes = ch_malloc( nhmax * sizeof(dn_id) * 2 );
AC_MEMCPY( holes, hbuf, sizeof(hbuf) );
} else {
holes = ch_realloc( holes, nhmax * sizeof(ID) * 2 );
holes = ch_realloc( holes, nhmax * sizeof(dn_id) * 2 );
}
nhmax *= 2;
}