|
 |
96373c |
From 23a82820bce65653f96450fcc410706fa555fbfd Mon Sep 17 00:00:00 2001
|
|
|
96373c |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
96373c |
Date: Mon, 16 Oct 2017 10:44:29 -0400
|
|
|
96373c |
Subject: [PATCH] Ticket 48235 - remove memberof lock (cherry-pick error)
|
|
|
96373c |
|
|
|
96373c |
Description: Fix cherry-pick error
|
|
|
96373c |
|
|
|
96373c |
https://pagure.io/389-ds-base/issue/48235
|
|
|
96373c |
|
|
|
96373c |
Reviewed by: mreynolds(one line commit rule)
|
|
|
96373c |
|
|
|
96373c |
(cherry picked from commit 3eb443b0ee11f3cf642ebfbcd135868a72ce39da)
|
|
|
96373c |
---
|
|
|
96373c |
ldap/servers/plugins/memberof/memberof.c | 3 ---
|
|
|
96373c |
ldap/servers/plugins/memberof/memberof.h | 2 --
|
|
|
96373c |
2 files changed, 5 deletions(-)
|
|
|
96373c |
|
|
|
96373c |
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
|
|
|
96373c |
index a23c52abe..bae242c81 100644
|
|
|
96373c |
--- a/ldap/servers/plugins/memberof/memberof.c
|
|
|
96373c |
+++ b/ldap/servers/plugins/memberof/memberof.c
|
|
|
96373c |
@@ -2828,9 +2828,6 @@ memberof_fixup_task_thread(void *arg)
|
|
|
96373c |
}
|
|
|
96373c |
}
|
|
|
96373c |
|
|
|
96373c |
- /* get the memberOf operation lock */
|
|
|
96373c |
- memberof_lock();
|
|
|
96373c |
-
|
|
|
96373c |
/* do real work */
|
|
|
96373c |
rc = memberof_fix_memberof(&configCopy, task, td);
|
|
|
96373c |
|
|
|
96373c |
diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h
|
|
|
96373c |
index ba64e9dfa..cf028453c 100644
|
|
|
96373c |
--- a/ldap/servers/plugins/memberof/memberof.h
|
|
|
96373c |
+++ b/ldap/servers/plugins/memberof/memberof.h
|
|
|
96373c |
@@ -88,8 +88,6 @@ int memberof_config(Slapi_Entry *config_e, Slapi_PBlock *pb);
|
|
|
96373c |
void memberof_copy_config(MemberOfConfig *dest, MemberOfConfig *src);
|
|
|
96373c |
void memberof_free_config(MemberOfConfig *config);
|
|
|
96373c |
MemberOfConfig *memberof_get_config(void);
|
|
|
96373c |
-void memberof_lock(void);
|
|
|
96373c |
-void memberof_unlock(void);
|
|
|
96373c |
void memberof_rlock_config(void);
|
|
|
96373c |
void memberof_wlock_config(void);
|
|
|
96373c |
void memberof_unlock_config(void);
|
|
|
96373c |
--
|
|
|
96373c |
2.13.6
|
|
|
96373c |
|