Fix the ipa user library cleanup

redhat-qe-security · Feb 5, 2024 · 203dbd9 · 203dbd9
1 parent b1dd350
commit 203dbd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SCAutolib/controller.py b/SCAutolib/controller.py
@@ -71,8 +71,8 @@ def __init__(self, config: Union[Path, str], params: {} = None):
         if LIB_DUMP_CAS.joinpath("local_ca.json").exists():
             self.local_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("local_ca.json"))
 
-        if LIB_DUMP_CAS.joinpath("ipa.json").exists():
-            self.ipa_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("ipa.json"))
+        if LIB_DUMP_CAS.joinpath("ipa-server.json").exists():
+            self.ipa_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("ipa-server.json"))
 
     def prepare(self, force: bool, gdm: bool, install_missing: bool,
                 graphical: bool):
@@ -405,7 +405,7 @@ def cleanup(self):
         users = {}
 
         for user_file in LIB_DUMP_USERS.iterdir():
-            usr = user.User.load(user_file)
+            usr = user.User.load(user_file, ipa_server=self.ipa_ca)
             users[usr.username] = usr
             if usr.username != "root":
                 usr.delete_user()

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name="SCAutolib",
-    version="3.1.1",
+    version="3.1.2",
     description=description,
     long_description=long_description,
     long_description_content_type='text/markdown',