Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / servers / slapd / overlays / dds.c

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index f6c30951b0754e016a59e9bfdfbead52d3752ef8..b5971cbc7f079fc1e804ae125ecf691bc897a76b 100644 (file)
--- 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 );