IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-server-upgrade: fix inconsistency in setup_lightweight_ca_key_retrieval

Browse Source 
The method setup_lightweight_ca_key_retrieval is called on
server upgrade and checks first if it needs to be executed or if
a previous upgrade already did the required steps.
The issue is that it looks for setup_lwca_key_retrieval in sysupgrade.state
but writes setup_lwca_key_retieval (with a missing r).

The fix consistently uses setup_lwca_key_retieval (as older installations
may already contain this key in sysupgrade.state).

Fixes https://pagure.io/freeipa/issue/7688

Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
This commit is contained in:
Florence Blanc-Renaud
2018-09-07 12:19:31 +02:00
committed by Christian Heimes
parent 703497532a
commit 0659ed3502
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ipaserver/install/cainstance.py
View File

@@ -1301,7 +1301,10 @@ class CAInstance(DogtagInstance):
self._ldap_enable(u'enabledService', "CA", self.fqdn, basedn, config)
def setup_lightweight_ca_key_retrieval(self):
if sysupgrade.get_upgrade_state('dogtag', 'setup_lwca_key_retrieval'):
# Important: there is a typo in the below string, which is known
# and should not be fixed as existing installations already use it
LWCA_KEY_RETRIEVAL = 'setup_lwca_key_retieval'
if sysupgrade.get_upgrade_state('dogtag', LWCA_KEY_RETRIEVAL):
return
logger.debug('Set up lightweight CA key retrieval')
@@ -1320,7 +1323,7 @@ class CAInstance(DogtagInstance):
directivesetter.set_directive(
self.config, k, v, quotes=False, separator='=')
sysupgrade.set_upgrade_state('dogtag', 'setup_lwca_key_retieval', True)
sysupgrade.set_upgrade_state('dogtag', LWCA_KEY_RETRIEVAL, True)
def __setup_lightweight_ca_key_retrieval_kerberos(self):
pent = pwd.getpwnam(self.service_user)