ITS#1733 eliminate o_abandonmutex

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index b23e6adf32333070152e6cc4862cc70c67815bc5..00777661d052ba729832cab1442df828a2c6c5a2 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -260,14 +260,8 @@ fail:;
                        rc != -1;
                        rc = ldap_result(lc->ld, LDAP_RES_ANY, 0, &tv, &res))
        {
-               int ab;
-
                /* check for abandon */
-               ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
-               ab = op->o_abandon;
-               ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
-
-               if (ab) {
+               if (op->o_abandon) {
                        ldap_abandon(lc->ld, msgid);
                        rc = 0;
                        goto finish;

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index ab379e9222d8c8bec6d3a11ff7d6e18dba8bd297..aef5d34caaefb8190be07aeedd64e6bfac728acc 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -201,7 +201,6 @@ monitor_subsys_log_modify(
 
                        goto cleanup;
                }
-               ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
 #endif
 
                /* check that the entry still obeys the schema */