From bedd4a458766f7b4130f96334bcea184b7ac2932 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 1 Jun 2021 12:34:02 +0300 Subject: [PATCH] Part 2 of the replication plugin rename fix Signed-off-by: Alexander Bokovoy --- freeipa-fix-389-ds-2.0.5-upgrade.patch | 14 +++++++------- freeipa.spec | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/freeipa-fix-389-ds-2.0.5-upgrade.patch b/freeipa-fix-389-ds-2.0.5-upgrade.patch index 2cfca87..1aba58b 100644 --- a/freeipa-fix-389-ds-2.0.5-upgrade.patch +++ b/freeipa-fix-389-ds-2.0.5-upgrade.patch @@ -1,4 +1,4 @@ -From 7ebd15465d7a8b31dd0b93d33c5837b084efc71c Mon Sep 17 00:00:00 2001 +From 4d4931abf0b77c431252389edb6f447b63c91d8c Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 31 May 2021 12:53:55 +0300 Subject: [PATCH] ds: Support renaming of a replication plugin in 389-ds @@ -90,7 +90,7 @@ index 34beebc10..287148ec8 100644 default: nsslapd-pluginVendor: none default: nsslapd-pluginDescription: none diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py -index 622d6a0f5..8eca095fa 100644 +index 622d6a0f5..b0e012ab8 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -571,6 +571,12 @@ class DsInstance(service.Service): @@ -98,7 +98,7 @@ index 622d6a0f5..8eca095fa 100644 inst.open() + def get_entry(dn, attrs): -+ return inst.getEntry(dn, attrslist=attrs) ++ return inst.getEntry(dn, attrlist=attrs) + + self.sub_dict['REPLICATION_PLUGIN'] = ( + replication.get_replication_plugin_name(get_entry)) @@ -116,7 +116,7 @@ index 622d6a0f5..8eca095fa 100644 def __config_uuid_module(self): self._ldap_mod("uuid-conf.ldif") diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py -index 5a3e5e565..89a5a4bd2 100644 +index 5a3e5e565..8fb4fd414 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -232,6 +232,23 @@ def get_ds_version(conn): @@ -133,9 +133,9 @@ index 5a3e5e565..89a5a4bd2 100644 + # returns entry dictionary + try: + entry = dirsrv_get_entry( -+ "cn=Multisupplier Replication Plugin,cn=plugins,cn=config", -+ ["cn"]) -+ return entry['cn'] ++ 'cn=Multisupplier Replication Plugin,cn=plugins,cn=config', ++ ['cn']) ++ return str(entry['cn'], encoding='utf-8') + except Exception: + return 'Multimaster Replication Plugin' + diff --git a/freeipa.spec b/freeipa.spec index 748e682..f492bca 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -181,7 +181,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 3%{?rc_version:.%rc_version}%{?dist} +Release: 4%{?rc_version:.%rc_version}%{?dist} Summary: The Identity, Policy and Audit system License: GPLv3+ @@ -1680,6 +1680,9 @@ fi %endif %changelog +* Tue Jun 01 2021 Alexander Bokovoy - 4.9.3-4 +- Handle upgrade of 389-ds replication plugin rename (part 2) + * Tue Jun 01 2021 Alexander Bokovoy - 4.9.3-3 - Handle upgrade of 389-ds replication plugin rename