Partial revert of f30269f5d2e4bb5ee7486fe6542078d1b59dba6d

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

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 56d299fdb0142148d5c7df7895458bab568b3100..f8b2dab5140d297b194522eef4bb88ad68fdc426 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-2011 The OpenLDAP Foundation.
+ * Copyright 2005-2012 The OpenLDAP Foundation.
  * Portions Copyright 2005-2006 SysNet s.n.c.
  * All rights reserved.
  *
@@ -156,7 +156,7 @@ dds_expire( void *ctx, dds_info_t *di )
        op->ors_slimit = SLAP_NO_LIMIT;
        op->ors_attrs = slap_anlist_no_attrs;
 
-       expire = slap_get_time() + di->di_tolerance;
+       expire = slap_get_time() - di->di_tolerance;
        ts.bv_val = tsbuf;
        ts.bv_len = sizeof( tsbuf );
        slap_timestamp( &expire, &ts );
@@ -1708,6 +1708,9 @@ dds_db_open(
        int             rc = 0;
        void            *thrctx = ldap_pvt_thread_pool_context();
 
+       if ( slapMode & SLAP_TOOL_MODE )
+               return 0;
+
        if ( DDS_OFF( di ) ) {
                goto done;
        }