|
 |
dc8c34 |
From fd424b4e5e517b7ff175abe3f00bb2e33ae399c7 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 27 Jul 2016 09:50:27 -0700
|
|
|
dc8c34 |
Subject: [PATCH] Ticket 48636 - Fix backporting errors
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: replica_lock/unlock pair is not ported to this version. (DS 47781)
|
|
|
dc8c34 |
(cherry picked from commit 6dbad429d00416dde2006f5af62eb63d41360992)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/plugins/replication/repl5_replica.c | 8 ++++----
|
|
|
dc8c34 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
|
|
|
dc8c34 |
index 9f85928..d25d00d 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/replication/repl5_replica.c
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/replication/repl5_replica.c
|
|
|
dc8c34 |
@@ -1056,9 +1056,9 @@ replica_get_legacy_purl (const Replica *r)
|
|
|
dc8c34 |
{
|
|
|
dc8c34 |
char *purl;
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- replica_lock(r->repl_lock);
|
|
|
dc8c34 |
+ PR_Lock(r->repl_lock);
|
|
|
dc8c34 |
purl = slapi_ch_strdup(r->legacy_purl);
|
|
|
dc8c34 |
- replica_unlock(r->repl_lock);
|
|
|
dc8c34 |
+ PR_Unlock(r->repl_lock);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
return purl;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
@@ -4084,11 +4084,11 @@ replica_add_session_abort_control(Slapi_PBlock *pb)
|
|
|
dc8c34 |
void
|
|
|
dc8c34 |
replica_check_release_timeout(Replica *r, Slapi_PBlock *pb)
|
|
|
dc8c34 |
{
|
|
|
dc8c34 |
- replica_lock(r->repl_lock);
|
|
|
dc8c34 |
+ PR_Lock(r->repl_lock);
|
|
|
dc8c34 |
if(r->abort_session == ABORT_SESSION){
|
|
|
dc8c34 |
/* Need to abort this session (just send the control once) */
|
|
|
dc8c34 |
replica_add_session_abort_control(pb);
|
|
|
dc8c34 |
r->abort_session = SESSION_ABORTED;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
- replica_unlock(r->repl_lock);
|
|
|
dc8c34 |
+ PR_Unlock(r->repl_lock);
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
2.4.11
|
|
|
dc8c34 |
|