diff options
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java | 4 | ||||
| -rw-r--r-- | pki/dogtag/common/pki-common.spec | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index 0c9a24bff..d1ca680a6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -292,6 +292,7 @@ public class AdminPanel extends WizardPanelBase { } else { String ca_hostname = null; int ca_port = -1; + boolean caRoot = false; // REMINDER: This panel is NOT used by "clones" if( subsystemtype.equals( "CA" ) ) { @@ -299,6 +300,7 @@ public class AdminPanel extends WizardPanelBase { CMS.debug( "AdminPanel update: " + "Root CA subsystem - " + "(existing Security Domain)" ); + caRoot = true; } else { CMS.debug( "AdminPanel update: " + "Subordinate CA subsystem - " @@ -310,7 +312,7 @@ public class AdminPanel extends WizardPanelBase { + " subsystem" ); } - if (type.equals("sdca")) { + if ((type.equals("sdca")) && (!caRoot)) { try { ca_hostname = config.getString("preop.ca.hostname"); ca_port = config.getInteger("preop.ca.httpsport"); diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec index a466c1a7a..5cd97feea 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 36 +%define base_release 37 %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 +* Wed Jul 1 2009 Ade lee <alee@redhat.com> 1.1.0-37 +- Bugzilla Bug #508219 - configuring a CA instance created with pkicreate fails at import admin cert panel with null pointer exception * Wed Jul 1 2009 Ade Lee <alee@redhat.com> 1.1.0-36 - Bugzilla Bug #224864 - pkiremove to remove entry from security domain more issues from port separation changes |