[389-commits] [389-ds-base] 01/01: Ticket 49413 - Changelog trimming ignores disabled replica-agreement
This is an automated email from the git hooks/post-receive script.
lkrispen pushed a commit to branch 389-ds-base-1.3.7
in repository 389-ds-base.
commit 8a4b26e41ec8941f052c007fd54fbb499dd7ddd3
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Tue Nov 14 11:25:18 2017 +0100
Ticket 49413 - Changelog trimming ignores disabled replica-agreement
Bug: if a replication agreement is disabled it is not taken into account when
changelog trimming determines where to stop.
If the agreement is reenabled later replication can fail
Fix: do not ignore disabled agreements in changelog trimming
Reviewed by: Thierry, thanks
---
ldap/servers/plugins/replication/cl5_api.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ldap/servers/plugins/replication/cl5_api.c
b/ldap/servers/plugins/replication/cl5_api.c
index 721013a..dc28579 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -4283,12 +4283,10 @@ _cl5GetRUV2Purge2(Object *fileObj, RUV **ruv)
while (agmtObj) {
agmt = (Repl_Agmt *)object_get_data(agmtObj);
PR_ASSERT(agmt);
-
- if (!agmt_is_enabled(agmt)) {
- agmtObj = agmtlist_get_next_agreement_for_replica(r, agmtObj);
- continue;
- }
-
+ /* we need to handle all agreements, also if they are not enabled
+ * if they will be later enabled and changes are trimmed
+ * replication can fail
+ */
consRUVObj = agmt_get_consumer_ruv(agmt);
if (consRUVObj) {
consRUV = (RUV *)object_get_data(consRUVObj);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.