upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ITS#8752 ppolicy: don't call same cleanup twice"

Browse source 
This reverts commit 1c963f4739.

Revert "ITS#8752 make sure all cleanups are called in overlay_op_walk"

This reverts commit b0ad788b8a.
This commit is contained in:
Howard Chu 2017-10-13 18:46:18 +01:00
parent 1c963f4739
commit 03ee55d725
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/slapd/backover.c
View file

@ -716,7 +716,8 @@ int overlay_op_walk(
if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
slap_callback *sc_next;
cleanup:
for ( ; op->o_callback; op->o_callback = sc_next ) {
for ( ; op->o_callback && op->o_callback->sc_response !=
over_back_response; op->o_callback = sc_next ) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_cleanup ) {
op->o_callback->sc_cleanup( op, rs );

1
servers/slapd/overlays/ppolicy.c
View file

@ -940,7 +940,6 @@ ppolicy_ctrls_cleanup( Operation *op, SlapReply *rs )
if ( ppb->send_ctrl ) {
ctrls_cleanup( op, rs, ppb->oldctrls );
}
op->o_callback->sc_cleanup = NULL;
return SLAP_CB_CONTINUE;
}