upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 20:49:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Yet another idl_merge fix (test032 failure)

Browse source
This commit is contained in:
Howard Chu 2005-09-15 03:49:52 +00:00
parent 6411c57028
commit d269703322
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/back-bdb/idl.c
View file

@ -1263,11 +1263,11 @@ int bdb_idl_merge( ID *a, ID *b )
if ( BDB_IDL_IS_RANGE( a ) || BDB_IDL_IS_RANGE(b) ||
a[0] + b[0] >= BDB_IDL_UM_MAX ) {
ida = IDL_MIN( a[1], b[1] );
idb = IDL_MAX( BDB_IDL_LAST(a), BDB_IDL_LAST(b) );
ida = BDB_IDL_LAST( a );
idb = BDB_IDL_LAST( b );
a[2] = IDL_MAX( ida, idb );
a[1] = IDL_MIN( a[1], b[1] );
a[0] = NOID;
a[1] = ida;
a[2] = idb;
return 0;
}
@ -1280,6 +1280,8 @@ int bdb_idl_merge( ID *a, ID *b )
if ( b[cursorb] > a[cursora] ) {
a[cursorc] = b[cursorb];
cursorb--;
if ( !cursorb )
break;
} else {
if ( cursora == cursorc )
break;