upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7699 fixed one dds start-up assertion failure

Browse source
This commit is contained in:
Ted C. Cheng 2013-09-18 15:33:17 -07:00 committed by Howard Chu
parent 5c91989477
commit a2e1b9b545
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
servers/slapd/overlays/dds.c
View file

@ -1733,8 +1733,15 @@ dds_db_open(
di->di_suffix = be->be_suffix;
di->di_nsuffix = be->be_nsuffix;
/* ... so that count, if required, is accurate */
if ( di->di_max_dynamicObjects > 0 ) {
/* count the dynamic objects first */
rc = dds_count( thrctx, be );
if ( rc != LDAP_SUCCESS ) {
rc = 1;
goto done;
}
/* ... if there are dynamic objects, delete those expired */
if ( di->di_num_dynamicObjects > 0 ) {
/* force deletion of expired entries... */
be->bd_info = (BackendInfo *)on->on_info;
rc = dds_expire( thrctx, di );
@ -1743,12 +1750,6 @@ dds_db_open(
rc = 1;
goto done;
}
rc = dds_count( thrctx, be );
if ( rc != LDAP_SUCCESS ) {
rc = 1;
goto done;
}
}
/* start expire task */