address ITS#4332; might remove dynamicObject counting

This commit is contained in:
Pierangelo Masarati 2006-01-14 11:12:56 +00:00
parent e720c15c4d
commit 72d2ee4d19

View File

@ -1723,17 +1723,17 @@ dds_db_open(
di->di_suffix = be->be_suffix; di->di_suffix = be->be_suffix;
di->di_nsuffix = be->be_nsuffix; di->di_nsuffix = be->be_nsuffix;
/* force deletion of expired entries... */
be->bd_info = (BackendInfo *)on->on_info;
rc = dds_expire( thrctx, di );
be->bd_info = (BackendInfo *)on;
if ( rc != LDAP_SUCCESS ) {
rc = 1;
goto done;
}
/* ... so that count, if required, is accurate */ /* ... so that count, if required, is accurate */
if ( di->di_max_dynamicObjects > 0 ) { if ( di->di_max_dynamicObjects > 0 ) {
/* force deletion of expired entries... */
be->bd_info = (BackendInfo *)on->on_info;
rc = dds_expire( thrctx, di );
be->bd_info = (BackendInfo *)on;
if ( rc != LDAP_SUCCESS ) {
rc = 1;
goto done;
}
rc = dds_count( thrctx, be ); rc = dds_count( thrctx, be );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
rc = 1; rc = 1;