Changes from HEAD for beta

[openldap] / servers / slapd / back-meta / cache-remove.c

diff --git a/servers/slapd/back-meta/cache-remove.c b/servers/slapd/back-meta/cache-remove.c
index ce7781f3b00c5f649598383a872b53b59464c4d7..f375ea11eb103f518f5e5caf524a91d5fd860900 100644 (file)
--- a/servers/slapd/back-meta/cache-remove.c
+++ b/servers/slapd/back-meta/cache-remove.c
@@ -34,7 +34,6 @@
 #include "../../../libraries/libldap/ldap-int.h"
 #include <sys/time.h>
 
-#ifdef LDAP_CACHING 
 static int
 remove_func (
        Operation       *op,
@@ -80,7 +79,6 @@ remove_query_data (
        op_tmp.o_callback = &cb;
        op_tmp.o_time = slap_get_time();
        op_tmp.o_do_not_cache = 1;
-       op_tmp.o_caching_on = 1; 
 
        op_tmp.o_req_dn = op->o_bd->be_suffix[0];
        op_tmp.o_req_ndn = op->o_bd->be_nsuffix[0];
@@ -189,5 +187,3 @@ remove_func (
 
        return 0;
 }
-
-#endif /* LDAP_CACHING */