upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 18:19:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7976 fix delta-mmr/accesslog interaction

Browse source
This commit is contained in:
Howard Chu 2014-10-30 15:00:13 +00:00
parent e6e073d31e
commit b0225e8e60
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/backover.c
View file

@ -684,9 +684,14 @@ int overlay_op_walk(
}
if ( rc == SLAP_CB_BYPASS )
rc = SLAP_CB_CONTINUE;
/* if an overlay halted processing, make sure
* any previously set cleanup handlers are run
*/
if ( rc != SLAP_CB_CONTINUE )
goto cleanup;
bi = oi->oi_orig;
if ( (&bi->bi_op_bind)[ which ] && rc == SLAP_CB_CONTINUE ) {
if ( (&bi->bi_op_bind)[ which ] ) {
op->o_bd->bd_info = bi;
rc = (&bi->bi_op_bind)[ which ]( op, rs );
}
@ -700,6 +705,7 @@ int overlay_op_walk(
*/
if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
slap_callback *sc_next;
cleanup:
for ( ; op->o_callback && op->o_callback->sc_response !=
over_back_response; op->o_callback = sc_next ) {
sc_next = op->o_callback->sc_next;

5
servers/slapd/syncrepl.c
View file

@ -2055,8 +2055,11 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
overlay_entry_release_ov( op, e, 0, on );
}
/* equal? Should never happen */
if ( match == 0 )
if ( match == 0 ) {
/* tell accesslog this was a failure */
rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS;
return LDAP_SUCCESS;
}
/* mod is older: resolve conflicts...
* 1. Save/copy original modlist. Split Replace to Del/Add.