From e3703bfaabb945a519213306097975f4e8ff4f5e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 28 Apr 2005 18:50:24 +0000 Subject: [PATCH] Propagate Abandon to allow cleanup callbacks to run --- servers/slapd/back-bdb/add.c | 2 +- servers/slapd/back-bdb/delete.c | 2 +- servers/slapd/back-bdb/modify.c | 2 +- servers/slapd/back-bdb/modrdn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index 2c099d493f..7db122d5bf 100644 --- 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 1c7de1e3ba..a0dcce5669 100644 --- 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 4b8b384b24..1f8af04ce4 100644 --- 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 7fffb27183..54c487c450 100644 --- 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; -- 2.39.5