X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Foverlays%2Fdds.c;h=b5971cbc7f079fc1e804ae125ecf691bc897a76b;hb=528b256e09e27c016692e8c5e2d9afe4327db77e;hp=f6c30951b0754e016a59e9bfdfbead52d3752ef8;hpb=1f6f4f4f281fd7da7b66c05606b66b029d87032f;p=openldap

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index f6c30951b0..b5971cbc7f 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2014 The OpenLDAP Foundation.
+ * Copyright 2005-2015 The OpenLDAP Foundation.
  * Portions Copyright 2005-2006 SysNet s.n.c.
  * All rights reserved.
  *
@@ -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,
@@ -1784,6 +1772,7 @@ dds_db_close(
 		}
 		ldap_pvt_runqueue_remove( &slapd_rq, di->di_expire_task );
 		ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+		di->di_expire_task = NULL;
 	}
 
 	(void)entry_info_unregister( dds_entry_info, (void *)di );