diff options
author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-05-19 17:13:22 +0000 |
---|---|---|
committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-05-19 17:13:22 +0000 |
commit | ac907d7dea8a3c6e6911fa040ca6709273905187 (patch) | |
tree | 8a9692d2b7fe67cae246b4fa55369c22a16dcbf7 /pki/base/common/src | |
parent | 90757db515f3df2e2418fe053318cfe5ad324604 (diff) | |
download | pki-ac907d7dea8a3c6e6911fa040ca6709273905187.tar.gz pki-ac907d7dea8a3c6e6911fa040ca6709273905187.tar.xz pki-ac907d7dea8a3c6e6911fa040ca6709273905187.zip |
Bug 577949 - clone from a clone requires contacting original security domain master - additional fixes
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1103 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index 5f3105403..a3872f713 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -961,7 +961,7 @@ public class WizardPanelBase implements IWizardPanel { } catch (Exception e) { CMS.debug( e.toString() ); } - return dm.equals("true"); + return dm.equalsIgnoreCase("true"); } public Vector getMasterUrlListFromSecurityDomain( IConfigStore config, @@ -1014,7 +1014,7 @@ public class WizardPanelBase implements IWizardPanel { Vector v_clone = parser.getValuesFromContainer(nodeList.item(i), "Clone"); String clone = (String)v_clone.elementAt(0); - if (clone.equals("true")) + if (clone.equalsIgnoreCase("true")) continue; Vector v_name = parser.getValuesFromContainer(nodeList.item(i), "SubsystemName"); @@ -1089,12 +1089,23 @@ public class WizardPanelBase implements IWizardPanel { "Host"); Vector v_port = parser.getValuesFromContainer(nodeList.item(i), portType); + Vector v_admin_port = parser.getValuesFromContainer(nodeList.item(i), + "SecureAdminPort"); - v.addElement( v_name.elementAt(0) + if (v_host.elementAt(0).equals(hostname) && v_admin_port.elementAt(0).equals(new Integer(httpsadminport).toString())) { + // add security domain CA to the beginning of list + v.add( 0, v_name.elementAt(0) + " - https://" + v_host.elementAt(0) + ":" + v_port.elementAt(0) ); + } else { + v.addElement( v_name.elementAt(0) + + " - https://" + + v_host.elementAt(0) + + ":" + + v_port.elementAt(0) ); + } } } catch (Exception e) { CMS.debug(e.toString()); |