Hi,
the attached patch fixes https://fedorahosted.org/freeipa/ticket/4547.
Honza
--
Jan Cholasta
From 8606fad0b8fb26ccdb3cc843509d04316a87efbd Mon Sep 17 00:00:00 2001
From: Jan Cholasta jchol...@redhat.com
Date: Wed, 17 Sep 2014 15:22:19 +0200
Subject: [PATCH] Fix certmonger code causing the ca_renewal_master update
plugin to fail
https://fedorahosted.org/freeipa/ticket/4547
---
ipapython/certmonger.py| 8 +++-
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 62b2ba8..b46d65b 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 52508b5..e246639 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,
--
1.9.3
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
