From 4ae1ff75f95746280a916a61a904d1c8e7b2546a Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 26 Oct 2015 13:24:14 +1000 Subject: [PATCH] Ticket 48323 - lib389 assertion causes issues when instance is named differently to directory. https://fedorahosted.org/389/ticket/48323 Bug Description: It's possible to create a ds instance where instance directory names are not the same as the instance name. In lib389 there is an assertion that attempts to make sure these are the same, even though that may not necessarily be true. Fix Description: Remove the assertion Author: wibrown Review by: ??? --- lib389/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib389/__init__.py b/lib389/__init__.py index 2119a94..fcabbc7 100644 --- a/lib389/__init__.py +++ b/lib389/__init__.py @@ -263,9 +263,7 @@ class DirSrv(SimpleLDAPObject): self.sroot = self.inst = '' # In case DirSrv was allocated without creating the instance # serverid is not set. Set it now from the config - if hasattr(self, 'serverid') and self.serverid: - assert self.serverid == self.inst - else: + if not (hasattr(self, 'serverid') and self.serverid): self.serverid = self.inst ent = self.getEntry('cn=config,' + DN_LDBM, -- 2.4.3