Propagate Abandon to allow cleanup callbacks to run

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 2c099d493f5c2e0969e58da597a6e817241eadc3..7db122d5bf4e25e72b60bf8ada3e431ce232f040 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -97,7 +97,7 @@ retry:        /* transaction retry */
                }
                if ( op->o_abandon ) {
                        rs->sr_err = SLAPD_ABANDON;
-                       goto done;
+                       goto return_results;
                }
                ldap_pvt_thread_yield();
                bdb_trans_backoff( ++num_retries );

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 1c7de1e3ba00ffb9fc3c19b14a6df7c561566d48..a0dcce5669ff1af4971d92c4069f8dc56b4ca313 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -85,7 +85,7 @@ retry:        /* transaction retry */
                }
                if ( op->o_abandon ) {
                        rs->sr_err = SLAPD_ABANDON;
-                       goto done;
+                       goto return_results;
                }
                parent_is_glue = 0;
                parent_is_leaf = 0;

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 4b8b384b24d6640f5dac02d1ae9f1a28ec1a02d6..1f8af04ce46746ed0b7a4c659e990a01ea89211a 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -312,7 +312,7 @@ retry:      /* transaction retry */
                }
                if ( op->o_abandon ) {
                        rs->sr_err = SLAPD_ABANDON;
-                       goto done;
+                       goto return_results;
                }
                ldap_pvt_thread_yield();
                bdb_trans_backoff( ++num_retries );

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 7fffb27183354c21b3290f621428fb9c27fa632d..54c487c4507b118cf8a574c323aef8bf16dc55fd 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -105,7 +105,7 @@ retry:      /* transaction retry */
                }
                if ( op->o_abandon ) {
                        rs->sr_err = SLAPD_ABANDON;
-                       goto done;
+                       goto return_results;
                }
                parent_is_glue = 0;
                parent_is_leaf = 0;