fix previous commit (ITS#5711)

This commit is contained in:
Pierangelo Masarati 2008-09-27 10:34:52 +00:00
parent a0e3e68a02
commit 7cc2acd111

View File

@ -855,8 +855,7 @@ ctrls_cleanup( Operation *op, SlapReply *rs, LDAPControl **oldctrls )
for ( n = 0; rs->sr_ctrls[n]; n++ ) { for ( n = 0; rs->sr_ctrls[n]; n++ ) {
if ( rs->sr_ctrls[n]->ldctl_oid == ppolicy_ctrl_oid ) { if ( rs->sr_ctrls[n]->ldctl_oid == ppolicy_ctrl_oid ) {
ch_free( rs->sr_ctrls[n]->ldctl_value.bv_val ); op->o_tmpfree( rs->sr_ctrls[n], op->o_tmpmemctx );
ch_free( rs->sr_ctrls[n] );
rs->sr_ctrls[n] = (LDAPControl *)(-1); rs->sr_ctrls[n] = (LDAPControl *)(-1);
break; break;
} }
@ -2021,7 +2020,7 @@ return_results:
if ( send_ctrl ) { if ( send_ctrl ) {
if ( is_pwdexop ) { if ( is_pwdexop ) {
if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) { if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
slap_free_ctrls( op, oldctrls ); op->o_tmpfree( oldctrls, op->o_tmpmemctx );
} }
oldctrls = NULL; oldctrls = NULL;
rs->sr_flags |= REP_CTRLS_MUSTBEFREED; rs->sr_flags |= REP_CTRLS_MUSTBEFREED;