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

Fix certmonger code causing the ca_renewal_master update plugin to fail

Browse Source 
https://fedorahosted.org/freeipa/ticket/4547

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta 2014-09-17 15:22:19 +02:00 committed by Petr Viktorin
parent 127e7a1dcc
commit 1a327cf429
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipapython/certmonger.py
View File

@ -166,7 +166,13 @@ def get_request_value(request_id, directive):
root_logger.error('Failed to get request: %s' % e) root_logger.error('Failed to get request: %s' % e)
raise raise
if request: if request:
return request.prop_if.Get(DBUS_CM_REQUEST_IF, directive) if directive == 'ca-name':
ca_path = request.obj_if.get_ca()
ca = _cm_dbus_object(request.bus, ca_path, DBUS_CM_CA_IF,
DBUS_CM_IF)
return ca.obj_if.get_nickname()
else:
return request.prop_if.Get(DBUS_CM_REQUEST_IF, directive)
else: else:
return None return None

2
ipaserver/install/plugins/ca_renewal_master.py
View File

@ -60,7 +60,7 @@ class update_ca_renewal_master(PostUpdate):
if request_id is not None: if request_id is not None:
self.debug("found certmonger request for ipaCert") self.debug("found certmonger request for ipaCert")
ca_name = certmonger.get_request_value(request_id, 'ca_name') ca_name = certmonger.get_request_value(request_id, 'ca-name')
if ca_name is None: if ca_name is None:
self.warning( self.warning(
"certmonger request for ipaCert is missing ca_name, " "certmonger request for ipaCert is missing ca_name, "