diff options
author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-18 22:47:15 +0000 |
---|---|---|
committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-18 22:47:15 +0000 |
commit | 12a691d5fb59b47bc7c6055fffee47a3e0dbc15f (patch) | |
tree | 2b790c40229125f799e78e447d716b1f27aba8ac /pki/base/common/src/com/netscape/cms/servlet | |
parent | d3e8a5b117dff39330f552d492e3b28f236f2650 (diff) | |
download | pki-12a691d5fb59b47bc7c6055fffee47a3e0dbc15f.tar.gz pki-12a691d5fb59b47bc7c6055fffee47a3e0dbc15f.tar.xz pki-12a691d5fb59b47bc7c6055fffee47a3e0dbc15f.zip |
Bugzilla Bug 670337: CA Clone configuration throws TCP connection error
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1746 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet')
3 files changed, 16 insertions, 3 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java index 6421e37ce..1130e50f7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java @@ -256,8 +256,13 @@ public class CreateSubsystemPanel extends WizardPanelBase { String host = u.getHost(); int https_ee_port = u.getPort(); + String https_admin_port = getSecurityDomainAdminPort( config, + host, + String.valueOf(https_ee_port) ); + config.putString("preop.master.hostname", host); config.putInteger("preop.master.httpsport", https_ee_port); + config.putString("preop.master.httpsadminport", https_admin_port); ConfigCertApprovalCallback certApprovalCallback = new ConfigCertApprovalCallback(); if (cstype.equals("ca")) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index 764e56e89..b84732a94 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -347,23 +347,25 @@ public class RestoreKeyCertPanel extends WizardPanelBase { int sd_port = -1; String master_hostname = ""; int master_port = -1; + int master_ee_port = -1; try { sd_hostname = config.getString("securitydomain.host", ""); sd_port = config.getInteger("securitydomain.httpsadminport", -1); master_hostname = config.getString("preop.master.hostname", ""); master_port = config.getInteger("preop.master.httpsadminport", -1); + master_ee_port = config.getInteger("preop.master.httpsport", -1); String content = ""; if (cstype.equals("ca") || cstype.equals("kra")) { content = "type=request&xmlOutput=true&sessionID="+session_id; CMS.debug("http content=" + content); - updateNumberRange(master_hostname, master_port, true, content, "request", response); + updateNumberRange(master_hostname, master_ee_port, true, content, "request", response); content = "type=serialNo&xmlOutput=true&sessionID="+session_id; - updateNumberRange(master_hostname, master_port, true, content, "serialNo", response); + updateNumberRange(master_hostname, master_ee_port, true, content, "serialNo", response); content = "type=replicaId&xmlOutput=true&sessionID="+session_id; - updateNumberRange(master_hostname, master_port, true, content, "replicaId", response); + updateNumberRange(master_hostname, master_ee_port, true, content, "replicaId", response); } String list = ""; 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 be142124f..862a269cd 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 @@ -1353,23 +1353,29 @@ public class WizardPanelBase implements IWizardPanel { } if (name.equals("cloning.signing.nickname")) { config.putString("preop.master.signing.nickname", v); + config.putString(type + ".cert.signing.nickname", v); config.putString(name, v); } else if (name.equals("cloning.ocsp_signing.nickname")) { config.putString("preop.master.ocsp_signing.nickname", v); + config.putString(type + ".cert.ocsp_signing.nickname", v); config.putString(name, v); } else if (name.equals("cloning.subsystem.nickname")) { config.putString("preop.master.subsystem.nickname", v); + config.putString(type + ".cert.subsystem.nickname", v); config.putString(name, v); } else if (name.equals("cloning.transport.nickname")) { config.putString("preop.master.transport.nickname", v); config.putString("kra.transportUnit.nickName", v); + config.putString("kra.cert.transport.nickname", v); config.putString(name, v); } else if (name.equals("cloning.storage.nickname")) { config.putString("preop.master.storage.nickname", v); config.putString("kra.storageUnit.nickName", v); + config.putString("kra.cert.storage.nickname", v); config.putString(name, v); } else if (name.equals("cloning.audit_signing.nickname")) { config.putString("preop.master.audit_signing.nickname", v); + config.putString(type + ".cert.audit_signing.nickname", v); config.putString(name, v); } else if (name.equals("cloning.module.token")) { config.putString("preop.module.token", v); |