diff options
author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-29 00:52:06 +0000 |
---|---|---|
committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-29 00:52:06 +0000 |
commit | efb44e62448dc85ffe41311d47b0d0f8217f8b2e (patch) | |
tree | 53109b0a8129c0292f82130580b6e4ec88664831 | |
parent | 24fa4f316c5964475414adf53d3ccf4b5066d182 (diff) | |
download | pki-efb44e62448dc85ffe41311d47b0d0f8217f8b2e.tar.gz pki-efb44e62448dc85ffe41311d47b0d0f8217f8b2e.tar.xz pki-efb44e62448dc85ffe41311d47b0d0f8217f8b2e.zip |
Bugzilla Bug #496334 - Renewal: Missing information in the first 6 requests in the CA request queue.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@420 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java | 28 | ||||
-rw-r--r-- | pki/dogtag/common/pki-common.spec | 4 |
2 files changed, 24 insertions, 8 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index fd12de3b1..08f0686c3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -204,8 +204,11 @@ public class CertUtil { req.setExtData("requestor_name", ""); req.setExtData("requestor_email", ""); req.setExtData("requestor_phone", ""); + req.setExtData("profileRemoteHost", ""); + req.setExtData("profileRemoteAddr", ""); req.setExtData("requestnotes",""); req.setExtData("isencryptioncert", "false"); + req.setExtData("profileapprovedby", "system"); // mark request as complete CMS.debug("certUtil: calling setRequestStatus"); @@ -264,6 +267,8 @@ public class CertUtil { ICertificateRepository cr = null; RequestId reqId = null; String profileId = null; + IRequestQueue queue = null; + IRequest req = null; try { String dn = config.getString(prefix + certTag + ".dn"); @@ -296,9 +301,8 @@ public class CertUtil { instanceRoot + "/conf/" + profile); // cfu - create request to enable renewal - IRequest req = null; try { - IRequestQueue queue = ca.getRequestQueue(); + queue = ca.getRequestQueue(); if (queue != null) { req = createLocalRequest(queue, serialNo.toString(), info); CMS.debug("CertUtil profile name= "+profile); @@ -321,11 +325,6 @@ public class CertUtil { reqId = req.getRequestId(); config.putString("preop.cert." + certTag + ".reqId", reqId.toString()); - - CMS.debug("certUtil: before updateRequest"); - - // store request record in db - queue.updateRequest(req); } else { CMS.debug("certUtil: requestQueue null"); } @@ -407,6 +406,21 @@ public class CertUtil { } } + if (req != null) { + // update request with cert + req.setExtData(IEnrollProfile.REQUEST_ISSUED_CERT, cert); + + // store request in db + try { + CMS.debug("certUtil: before updateRequest"); + if (queue != null) { + queue.updateRequest(req); + } + } catch (Exception e) { + CMS.debug("Exception in updateRequest" + e); + } + } + return cert; } diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec index ec8c2d8a0..4ca4fb457 100644 --- a/pki/dogtag/common/pki-common.spec +++ b/pki/dogtag/common/pki-common.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.1.0 -%define base_release 7 +%define base_release 8 %define base_group System Environment/Base %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -285,6 +285,8 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall ############################################################################### %changelog +* Tue Apr 28 2009 Ade Lee <alee@redhat.com> 1.1.0-8 +- Bugzilla Bug #496334 - Renewal: Missing information in the first 6 requests in the CA request queue. * Sat Apr 18 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-7 - Bugzilla Bug #496409 - Display missing "Security Domain" information on Security Domain Login Panel |