From 3dca68488eaefa58bda18db6b6afb20bca1a3e40 Mon Sep 17 00:00:00 2001
From: alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Fri, 10 Jul 2009 16:58:57 +0000
Subject: Bugzilla Bug #510163 -  KRA clone throws null pointer exception when
 searching for requests

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@693 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 .../netscape/cms/servlet/csadmin/NamePanel.java    | 26 ++++++++++++++++++++++
 pki/dogtag/common/pki-common.spec                  |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'pki')

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index 66cf6b6c3..63b0d6595 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
@@ -325,6 +325,31 @@ public class NamePanel extends WizardPanelBase {
         } // while
     }
 
+    /* 
+     * update some parameters for clones
+     */
+    public void updateCloneConfig(IConfigStore config)
+        throws EBaseException, IOException {
+        String cstype = config.getString("cs.type", null);
+        cstype = toLowerCaseSubsystemType(cstype);
+        if (cstype.equals("kra")) {
+            String token = config.getString(PRE_CONF_CA_TOKEN);
+            if (!token.equals("Internal Key Storage Token")) {
+                CMS.debug("NamePanel: updating configuration for KRA clone with hardware token");        
+                String subsystem = config.getString(PCERT_PREFIX + "storage.subsystem");
+                String storageNickname = getNickname(config, "storage");
+                String transportNickname = getNickname(config, "transport");
+
+                config.putString(subsystem + ".storageUnit.hardware", token);
+                config.putString(subsystem + ".storageUnit.nickName", token+":"+storageNickname);
+                config.putString(subsystem + ".transportUnit.nickName", token+":"+transportNickname);
+                config.commit(false);
+            } else { // software token
+                // parameters already set
+            }
+        }
+    }
+
     /*
      * get some of the "preop" parameters to persisting parameters
      */
@@ -691,6 +716,7 @@ public class NamePanel extends WizardPanelBase {
                    url = url.substring(url.indexOf("https"));
                    config.putString("preop.ca.url", url);
                 }
+                updateCloneConfig(config);
                 CMS.debug("NamePanel: clone configuration done");
                 return;
             }
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 503d760ff..875cf55c5 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      41
+%define base_release      42
 %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
+* Fri Jul 10 2009 Ade Lee <alee@redhat.com> 1.1.0-42
+- Bugzilla Bug #510163 -  KRA clone throws null pointer exception when searching for requests
 * Tue Jul 7 2009 Ade lee <alee@redhat.com> 1.1.0-41
 - Bugzilla Bug #510232 - clone ca server cert - wizard ignores SubjectName and Nickname customization
 * Tue Jul 7 2009 Ade lee <alee@redhat.com> 1.1.0-40
-- 
cgit