fix slap_sl_free() calls in pre / post read controls

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 07b8265283f9d5c50b15fd41bcf8813eac4600a3..2c3826d0c76dc56de2d6792ab22962ce56db9f1b 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -469,8 +469,8 @@ done:
        }
 
        if( postread_ctrl != NULL ) {
-               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *postread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *postread_ctrl, op->o_tmpmemctx );
        }
        return rs->sr_err;
 }

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 6e54172f57fa7841019e1f27f791359add75fde5..701ff22ec96e4bf92a4dc8248134ca6d69b773b2 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -595,8 +595,8 @@ done:
        slap_sl_free( ctxcsn_ndn.bv_val, op->o_tmpmemctx );
 
        if( preread_ctrl != NULL ) {
-               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *preread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *preread_ctrl, op->o_tmpmemctx );
        }
        return rs->sr_err;
 }

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index fe613d1dbd2d65925af7ab5dfe9c4044df675a14..0df677600fcf104df456799413911184c0ec2767 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -662,12 +662,12 @@ done:
        }
 
        if( preread_ctrl != NULL ) {
-               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *preread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *preread_ctrl, op->o_tmpmemctx );
        }
        if( postread_ctrl != NULL ) {
-               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *postread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *postread_ctrl, op->o_tmpmemctx );
        }
        return rs->sr_err;
 }

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 042311b00f2a8bd82cae33c6cd535e1b5f2f3074..82f48c4210faab88dfe2bf810f9c59b5eb228c72 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -949,12 +949,12 @@ done:
        }
 
        if( preread_ctrl != NULL ) {
-               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *preread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *preread_ctrl, op->o_tmpmemctx );
        }
        if( postread_ctrl != NULL ) {
-               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
-               slap_sl_free( *postread_ctrl, &op->o_tmpmemctx );
+               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *postread_ctrl, op->o_tmpmemctx );
        }
        return rs->sr_err;
 }

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f2ef04cb35665bb4b38ae7d2ba9970c9d2f81278..9a05fb06a52f39a7fe1e65a7e663f223b77c2c65 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -1510,7 +1510,7 @@ int slap_read_controls(
                *ctrl = (LDAPControl *) slap_sl_calloc( 1, sizeof(LDAPControl), NULL );
        } else {
                /* retry: free previous try */
-               slap_sl_free( (*ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
+               slap_sl_free( (*ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
        }
 
        **ctrl = c;