[Pkg-openldap-devel] [openldap] 06/208: ITS#8133 avoid mods during dds_db_open

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit b75c90aee8e49598bcbe5ada7403b66ac4ac203d
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed May 6 21:39:10 2015 -0700

    ITS#8133 avoid mods during dds_db_open
    
    If dds is present early in the overlay stack, the modify ops from
    dds_expire can trigger other overlays before they have initialized.
    Avoid that by delaying the first expiry until startup has finished.
---
 servers/slapd/overlays/dds.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 5625331..b5971cb 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -1740,18 +1740,6 @@ dds_db_open(
 		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 );
-		be->bd_info = (BackendInfo *)on;
-		if ( rc != LDAP_SUCCESS ) {
-			rc = 1;
-			goto done;
-		}
-	}
-
 	/* start expire task */
 	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
 	di->di_expire_task = ldap_pvt_runqueue_insert( &slapd_rq,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git