From 17abe7e7108e1629fab4275b56eb591bfab28bf3 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 4 Mar 2021 17:00:58 +0000
Subject: [PATCH] ITS#9491 plug memctx leak - frontend already clears it

---
 servers/slapd/back-asyncmeta/add.c            |  1 -
 servers/slapd/back-asyncmeta/back-asyncmeta.h |  2 --
 servers/slapd/back-asyncmeta/compare.c        |  1 -
 servers/slapd/back-asyncmeta/delete.c         |  1 -
 servers/slapd/back-asyncmeta/message_queue.c  | 10 ----------
 servers/slapd/back-asyncmeta/modify.c         |  1 -
 servers/slapd/back-asyncmeta/modrdn.c         |  1 -
 servers/slapd/back-asyncmeta/search.c         |  1 -
 8 files changed, 18 deletions(-)

diff --git a/servers/slapd/back-asyncmeta/add.c b/servers/slapd/back-asyncmeta/add.c
index 31057d21f0..f672467e8b 100644
--- a/servers/slapd/back-asyncmeta/add.c
+++ b/servers/slapd/back-asyncmeta/add.c
@@ -355,7 +355,6 @@ retry:
 	mc->mc_conns[candidate].msc_active--;
 	asyncmeta_start_one_listener(mc, candidates, bc, candidate);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;
 finish:
diff --git a/servers/slapd/back-asyncmeta/back-asyncmeta.h b/servers/slapd/back-asyncmeta/back-asyncmeta.h
index 9068b0d72d..550054c1e4 100644
--- a/servers/slapd/back-asyncmeta/back-asyncmeta.h
+++ b/servers/slapd/back-asyncmeta/back-asyncmeta.h
@@ -611,8 +611,6 @@ void asyncmeta_drop_bc_from_fconn(bm_context_t *bc);
 bm_context_t *
 asyncmeta_find_message(ber_int_t msgid, a_metaconn_t *mc, int candidate);
 
-void asyncmeta_memctx_toggle(void *thrctx);
-
 void* asyncmeta_op_handle_result(void *ctx, void *arg);
 int asyncmeta_back_cleanup( Operation *op, SlapReply *rs, bm_context_t *bm );
 
diff --git a/servers/slapd/back-asyncmeta/compare.c b/servers/slapd/back-asyncmeta/compare.c
index 1b8d666381..6448197ff3 100644
--- a/servers/slapd/back-asyncmeta/compare.c
+++ b/servers/slapd/back-asyncmeta/compare.c
@@ -297,7 +297,6 @@ retry:
 	mc->mc_conns[candidate].msc_active--;
 	asyncmeta_start_one_listener(mc, candidates, bc, candidate);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;
 finish:
diff --git a/servers/slapd/back-asyncmeta/delete.c b/servers/slapd/back-asyncmeta/delete.c
index 0fe6c0f380..6f7ee9d291 100644
--- a/servers/slapd/back-asyncmeta/delete.c
+++ b/servers/slapd/back-asyncmeta/delete.c
@@ -290,7 +290,6 @@ retry:
 	mc->mc_conns[candidate].msc_active--;
 	asyncmeta_start_one_listener(mc, candidates, bc, candidate);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;
 finish:
diff --git a/servers/slapd/back-asyncmeta/message_queue.c b/servers/slapd/back-asyncmeta/message_queue.c
index c76e8b68f5..f059545401 100644
--- a/servers/slapd/back-asyncmeta/message_queue.c
+++ b/servers/slapd/back-asyncmeta/message_queue.c
@@ -51,22 +51,12 @@ typedef struct listhead {
 #define LH_MAX	16
 #endif
 
-static void *asyncmeta_memctx_get(void *threadctx)
-{
-	return slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, threadctx, 1);
-}
-
 static void asyncmeta_memctx_put(void *threadctx, void *memctx)
 {
 	slap_sl_mem_setctx(threadctx, NULL);
 	slap_sl_mem_destroy((void *)1, memctx);
 }
 
-void asyncmeta_memctx_toggle(void *thrctx)
-{
-	asyncmeta_memctx_get(thrctx);
-}
-
 int asyncmeta_new_bm_context(Operation *op,
 			     SlapReply *rs,
 			     bm_context_t **new_bc,
diff --git a/servers/slapd/back-asyncmeta/modify.c b/servers/slapd/back-asyncmeta/modify.c
index c1ad3391a4..a6a1f5666a 100644
--- a/servers/slapd/back-asyncmeta/modify.c
+++ b/servers/slapd/back-asyncmeta/modify.c
@@ -349,7 +349,6 @@ retry:
 	mc->mc_conns[candidate].msc_active--;
 	asyncmeta_start_one_listener(mc, candidates, bc, candidate);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;
 
diff --git a/servers/slapd/back-asyncmeta/modrdn.c b/servers/slapd/back-asyncmeta/modrdn.c
index e78678a350..970566e4de 100644
--- a/servers/slapd/back-asyncmeta/modrdn.c
+++ b/servers/slapd/back-asyncmeta/modrdn.c
@@ -360,7 +360,6 @@ retry:
 	mc->mc_conns[candidate].msc_active--;
 	asyncmeta_start_one_listener(mc, candidates, bc, candidate);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;
 finish:
diff --git a/servers/slapd/back-asyncmeta/search.c b/servers/slapd/back-asyncmeta/search.c
index 0a6ed632ce..5321d007a1 100644
--- a/servers/slapd/back-asyncmeta/search.c
+++ b/servers/slapd/back-asyncmeta/search.c
@@ -923,7 +923,6 @@ retry:
 
 	asyncmeta_start_listeners(mc, candidates, bc);
 	bc->bc_active--;
-	asyncmeta_memctx_toggle(thrctx);
 	ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 	rs->sr_err = SLAPD_ASYNCOP;