From 151ecf63106425cada104d141a81722570ba2b28 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 2 Aug 2018 10:33:08 +0300 Subject: [PATCH] ConfigurationUtil: support new format for nsds5replicaLastInitStatus value pkispawn is reading the attribute nsds5replicaLastInitStatus in cn=masterAgreement1-$hostname-pki-tomcat,cn=replica,cn=o\3Dipaca,cn=mapping tree,cn=config in order to find the replication status. The new format (in 389-ds-base-1.3.7) for this attribute is "Error (0) Total update succeeded" but pkispawn is expecting "0 Total update succeeded" 389-ds-base introduced this change with https://pagure.io/389-ds-base/issue/49599 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1596629 --- .../cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index 576feff56..e443116d7 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -2025,7 +2025,7 @@ public class ConfigurationUtils { } String status = replicationStatus(replicadn, masterConn, masterAgreementName); - if (!status.startsWith("0 ")) { + if (!(status.startsWith("Error (0) ") || status.startsWith("0 "))) { CMS.debug("setupReplication: consumer initialization failed. " + status); throw new IOException("consumer initialization failed. " + status); } -- 2.14.4