From 98df4006b188a6c60a83166724d9322475cac91d Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 11 Apr 2002 08:08:42 +0000 Subject: [PATCH] ITS#1733 eliminate o_abandonmutex --- servers/slapd/back-ldap/search.c | 8 +------- servers/slapd/back-monitor/log.c | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c index b23e6adf32..00777661d0 100644 --- 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 ab379e9222..aef5d34caa 100644 --- 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 */ -- 2.39.5