From fc8c55f80f2aec2e4096ddefd867dda660eb16f0 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 10 Dec 2014 18:17:12 -0600
Subject: [PATCH] ITS#7976 fix delta-mmr/accesslog interaction
---
servers/slapd/backover.c | 9 ++++++++-
servers/slapd/syncrepl.c | 5 ++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 8ec4b6bc56..65d0e4bf4b 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -665,8 +665,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;
+
func = &oi->oi_orig->bi_op_bind;
- if ( func[which] && rc == SLAP_CB_CONTINUE ) {
+ if ( func[which] ) {
op->o_bd->bd_info = oi->oi_orig;
rc = func[which]( op, rs );
}
@@ -680,6 +686,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;
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 836adf1ed6..caab9f58ed 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -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.
--
GitLab