From 4471b73509fb2a0e40143e1dcf7f41f668451f79 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Oct 16 2017 14:47:10 +0000 Subject: Ticket 48235 - remove memberof lock (cherry-pick error) Description: Fix cherry-pick error https://pagure.io/389-ds-base/issue/48235 Reviewed by: mreynolds(one line commit rule) (cherry picked from commit 3eb443b0ee11f3cf642ebfbcd135868a72ce39da) --- diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c index a23c52a..bae242c 100644 --- a/ldap/servers/plugins/memberof/memberof.c +++ b/ldap/servers/plugins/memberof/memberof.c @@ -2828,9 +2828,6 @@ memberof_fixup_task_thread(void *arg) } } - /* get the memberOf operation lock */ - memberof_lock(); - /* do real work */ rc = memberof_fix_memberof(&configCopy, task, td); diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h index ba64e9d..cf02845 100644 --- a/ldap/servers/plugins/memberof/memberof.h +++ b/ldap/servers/plugins/memberof/memberof.h @@ -88,8 +88,6 @@ int memberof_config(Slapi_Entry *config_e, Slapi_PBlock *pb); void memberof_copy_config(MemberOfConfig *dest, MemberOfConfig *src); void memberof_free_config(MemberOfConfig *config); MemberOfConfig *memberof_get_config(void); -void memberof_lock(void); -void memberof_unlock(void); void memberof_rlock_config(void); void memberof_wlock_config(void); void memberof_unlock_config(void);