ITS#8261 change sl_mem_detach to sl_mem_setctx

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 7c8bbf624d4878f110d7000ba128fb00de855008..9e96f9896c1108486e56a5af14dd5be614128c9d 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1839,7 +1839,7 @@ LDAP_SLAPD_V (BerMemoryFunctions) slap_sl_mfuncs;
 LDAP_SLAPD_F (void) slap_sl_mem_init LDAP_P(( void ));
 LDAP_SLAPD_F (void *) slap_sl_mem_create LDAP_P((
                                                ber_len_t size, int stack, void *ctx, int flag ));
-LDAP_SLAPD_F (void) slap_sl_mem_detach LDAP_P(( void *ctx, void *memctx ));
+LDAP_SLAPD_F (void) slap_sl_mem_setctx LDAP_P(( void *ctx, void *memctx ));
 LDAP_SLAPD_F (void) slap_sl_mem_destroy LDAP_P(( void *key, void *data ));
 LDAP_SLAPD_F (void *) slap_sl_context LDAP_P(( void *ptr ));
 

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index d440acbf28e6c0547b0ae423766e51ff3129738f..017e61301e51cebbf6b88b52f133716fde5d5b1b 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -279,16 +279,17 @@ slap_sl_mem_create(
 }
 
 /*
- * Separate memory context from thread context.  Future users must
+ * Assign memory context to thread context. Use NULL to detach
+ * current memory context from thread. Future users must
  * know the context, since ch_free/slap_sl_context() cannot find it.
  */
 void
-slap_sl_mem_detach(
+slap_sl_mem_setctx(
        void *thrctx,
        void *memctx
 )
 {
-       SET_MEMCTX(thrctx, NULL, 0);
+       SET_MEMCTX(thrctx, memctx, slap_sl_mem_destroy);
 }
 
 void *