diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-09-17 15:22:19 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-09-23 16:25:15 +0200 |
| commit | 26188d7610170ff2fb89b12cd63a0c698a2381cb (patch) | |
| tree | bf71acf38fd3b33ce6a3c4d2cf29078526680768 | |
| parent | c436352e14a7d3ac4f4cf8888454c6749ddd2f13 (diff) | |
| download | freeipa-26188d7610170ff2fb89b12cd63a0c698a2381cb.tar.gz freeipa-26188d7610170ff2fb89b12cd63a0c698a2381cb.tar.xz freeipa-26188d7610170ff2fb89b12cd63a0c698a2381cb.zip | |
Fix certmonger code causing the ca_renewal_master update plugin to fail
https://fedorahosted.org/freeipa/ticket/4547
Reviewed-By: David Kupka <dkupka@redhat.com>
| -rw-r--r-- | ipapython/certmonger.py | 8 | ||||
| -rw-r--r-- | ipaserver/install/plugins/ca_renewal_master.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py index 62b2ba86d..b46d65b2f 100644 --- a/ipapython/certmonger.py +++ b/ipapython/certmonger.py @@ -166,7 +166,13 @@ def get_request_value(request_id, directive): root_logger.error('Failed to get request: %s' % e) raise 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: return None diff --git a/ipaserver/install/plugins/ca_renewal_master.py b/ipaserver/install/plugins/ca_renewal_master.py index 52508b589..e24663910 100644 --- a/ipaserver/install/plugins/ca_renewal_master.py +++ b/ipaserver/install/plugins/ca_renewal_master.py @@ -60,7 +60,7 @@ class update_ca_renewal_master(PostUpdate): if request_id is not None: 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: self.warning( "certmonger request for ipaCert is missing ca_name, " |