upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-21 06:14:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7641 don't muck with controls if slapi doesn't use them

Browse source
This commit is contained in:
Timothy Pearson 2013-07-26 13:15:58 -07:00 committed by Howard Chu
parent 96bf741367
commit 65f891d7a2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/slapi/slapi_overlay.c
View file

@ -454,11 +454,11 @@ slapi_over_merge_controls( Operation *op, SlapReply *rs )
n_slapi_ctrls = slapi_int_count_controls( slapi_ctrls );
n_rs_ctrls = slapi_int_count_controls( rs->sr_ctrls );
slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
if ( n_slapi_ctrls == 0 )
return LDAP_SUCCESS; /* no SLAPI controls */
slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
ctrls = (LDAPControl **) op->o_tmpalloc(
( n_slapi_ctrls + n_rs_ctrls + 1 ) * sizeof(LDAPControl *),
op->o_tmpmemctx );