From 9f3344a395b332db99a8ce5bdc14824fdbe09fc4 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Mar 11 2019 14:30:21 +0000
Subject: Ticket 50208 - lib389- Fix issue with list all instances


Description:  There was a regression where listing "all" instances
              failed and returned none.  This corrects the instance
              path gathering logic

https://pagure.io/389-ds-base/issue/50208

Reviewed by: firstyear(Thanks!)

---

diff --git a/src/lib389/lib389/__init__.py b/src/lib389/lib389/__init__.py
index 7151497..b9a87a7 100644
--- a/src/lib389/lib389/__init__.py
+++ b/src/lib389/lib389/__init__.py
@@ -745,13 +745,16 @@ class DirSrv(SimpleLDAPObject, object):
                 self.log.debug("list instance not found in {}: {}\n".format(dse_ldif, serverid))
         else:
             # For each dir that starts with slapd-*
+            inst_path = self.ds_paths.sysconf_dir + "/dirsrv"
             potential_inst = [
-                f for f
-                in os.listdir(self.ds_paths.sysconf_dir)
-                if os.path.isdir(f) and f.startswith('slapd-')]
+                os.path.join(inst_path, f)
+                for f in os.listdir(inst_path)
+                if f.startswith('slapd-')
+            ]
+
             # check it has dse.ldif
             for pi in potential_inst:
-                pi_dse_ldif = os.path.join(potential_inst, 'dse.ldif')
+                pi_dse_ldif = os.path.join(pi, 'dse.ldif')
                 # Takes /etc/dirsrv/slapd-instance -> slapd-instance -> instance
                 pi_name = pi.split('/')[-1].split('-')[-1]
                 # parse + append