86420dd2f3
- Resolves: RHEL-53501 adtrustinstance only prints issues in check_inst() and does not log them - Resolves: RHEL-52305 Unconditionally add MS-PAC to global config - Resolves: RHEL-52223 ipa-replica/server-install with softhsm needs to check permission/ownership of /var/lib/softhsm/tokens to avoid install failure - Resolves: RHEL-51937 Include latest fixes in python3-ipatests packages - Resolves: RHEL-50805 ipa-migrate -Z with invalid cert options fails with 'ValueError: option error' - Resolves: RHEL-49805 misleading warning for missing ipa-selinux-nfast package on luna hsm h/w - Resolves: RHEL-49592 'Unable to log in as uid=admin-replica.testrealm.test,ou=people,o=ipaca' during replica install - Resolves: RHEL-4879 RFE - Keep the configured value for the "nsslapd-ignore-time-skew" after a "force-sync" Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From fdd471d55c73503456683b1dea55769700730b16 Mon Sep 17 00:00:00 2001
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
|
Date: Thu, 18 Jul 2024 13:40:28 -0400
|
|
Subject: [PATCH] Fix a copy/paste issue when detecting the HSM SELinux
|
|
subpackage
|
|
|
|
I made a mistake when trying to detect which HSM is being used
|
|
to ensure that the appropriate SELinux subpackage is installed.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/9636
|
|
|
|
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
---
|
|
ipaserver/install/ca.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
|
|
index b8155d9965712dbce4076e9d73d6712135309ce2..e57dc47587fa0e0a6dbbe7511784af065560d782 100644
|
|
--- a/ipaserver/install/ca.py
|
|
+++ b/ipaserver/install/ca.py
|
|
@@ -265,7 +265,7 @@ def hsm_validator(token_name, token_library, token_password):
|
|
if 'nfast' in token_library:
|
|
module = 'ipa-selinux-nfast'
|
|
elif 'luna' in token_library:
|
|
- module = 'ipa-selinux-nfast'
|
|
+ module = 'ipa-selinux-luna'
|
|
else:
|
|
module = None
|
|
if module:
|
|
--
|
|
2.45.2
|
|
|