|
 |
95ea96 |
From 7fe3cba3d4cbe62c23e0e74f6bf3c44c50feb985 Mon Sep 17 00:00:00 2001
|
|
|
2737e7 |
From: Florence Blanc-Renaud <flo@redhat.com>
|
|
|
2737e7 |
Date: Tue, 4 Sep 2018 14:15:50 +0200
|
|
|
2737e7 |
Subject: [PATCH] ipa-replica-install: fix pkinit setup
|
|
|
2737e7 |
|
|
|
2737e7 |
commit 7284097 (Delay enabling services until end of installer)
|
|
|
2737e7 |
introduced a regression in replica installation.
|
|
|
2737e7 |
When the replica requests a cert for PKINIT, a check is done
|
|
|
2737e7 |
to ensure that the hostname corresponds to a machine with a
|
|
|
2737e7 |
KDC service enabled (ipaconfigstring attribute of
|
|
|
2737e7 |
cn=KDC,cn=<hostname>,cn=masters,cn=ipa,cn=etc,$BASEDN must contain
|
|
|
2737e7 |
'enabledService').
|
|
|
2737e7 |
With the commit mentioned above, the service is set to enabled only
|
|
|
2737e7 |
at the end of the installation.
|
|
|
2737e7 |
|
|
|
2737e7 |
The fix makes a less strict check, ensuring that 'enabledService'
|
|
|
2737e7 |
or 'configuredService' is in ipaconfigstring.
|
|
|
2737e7 |
|
|
|
2737e7 |
Fixes: https://pagure.io/freeipa/issue/7566
|
|
|
2737e7 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
2737e7 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
2737e7 |
---
|
|
|
95ea96 |
ipaserver/plugins/cert.py | 6 ++++--
|
|
|
95ea96 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
2737e7 |
|
|
|
2737e7 |
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
|
|
|
95ea96 |
index 0663272c9b4fd73225f63fe52d8d31157d5cc690..ed78388c8b8b4688873a5b047fb1b67e417a8a6d 100644
|
|
|
2737e7 |
--- a/ipaserver/plugins/cert.py
|
|
|
2737e7 |
+++ b/ipaserver/plugins/cert.py
|
|
|
95ea96 |
@@ -300,9 +300,11 @@ def ca_kdc_check(api_instance, hostname):
|
|
|
2737e7 |
|
|
|
2737e7 |
ipaconfigstring = {val.lower() for val in kdc_entry['ipaConfigString']}
|
|
|
2737e7 |
|
|
|
2737e7 |
- if 'enabledservice' not in ipaconfigstring:
|
|
|
2737e7 |
+ if 'enabledservice' not in ipaconfigstring \
|
|
|
2737e7 |
+ and 'configuredservice' not in ipaconfigstring:
|
|
|
95ea96 |
raise errors.NotFound(
|
|
|
95ea96 |
- reason=_("enabledService not in ipaConfigString kdc entry"))
|
|
|
95ea96 |
+ reason=_("enabledService/configuredService not in "
|
|
|
95ea96 |
+ "ipaConfigString kdc entry"))
|
|
|
2737e7 |
|
|
|
2737e7 |
except errors.NotFound:
|
|
|
95ea96 |
raise errors.ACIError(
|
|
|
2737e7 |
--
|
|
|
2737e7 |
2.17.1
|
|
|
2737e7 |
|