diff options
| author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-24 17:19:39 +0000 |
|---|---|---|
| committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-24 17:19:39 +0000 |
| commit | a9a1c17cedf95d4f715437acf0d1c9b92335166c (patch) | |
| tree | 2383dfdb97df473f99ee27340c2edcbd8c4bb890 /pki/base/common/src/com/netscape/cms/servlet/csadmin | |
| parent | 5698af1a1da5cde0f22123bd159aaeb0b0689dd4 (diff) | |
| download | pki-a9a1c17cedf95d4f715437acf0d1c9b92335166c.tar.gz pki-a9a1c17cedf95d4f715437acf0d1c9b92335166c.tar.xz pki-a9a1c17cedf95d4f715437acf0d1c9b92335166c.zip | |
Bugzilla BZ 653576 - tomcat5 does not always run filters on servlets as expected
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1587 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
3 files changed, 4 insertions, 4 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java index 4077559ef..876cd2a04 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java @@ -190,7 +190,7 @@ public class AdminAuthenticatePanel extends WizardPanelBase { } try { - httpsport = config.getInteger("preop.master.httpsport"); + httpsport = config.getInteger("preop.master.httpsadminport"); } catch (Exception e) { CMS.debug("AdminAuthenticatePanel update: "+e.toString()); context.put("errorString", "Missing port for master"); 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 da9c6ddc9..6421e37ce 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 @@ -261,7 +261,7 @@ public class CreateSubsystemPanel extends WizardPanelBase { ConfigCertApprovalCallback certApprovalCallback = new ConfigCertApprovalCallback(); if (cstype.equals("ca")) { - updateCertChain( config, "clone", host, https_ee_port, + updateCertChainUsingSecureEEPort( config, "clone", host, https_ee_port, true, context, certApprovalCallback ); } 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 190fa1baf..53b172cf5 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 @@ -349,9 +349,9 @@ public class RestoreKeyCertPanel extends WizardPanelBase { int master_port = -1; try { sd_hostname = config.getString("securitydomain.host", ""); - sd_port = config.getInteger("securitydomain.httpseeport", -1); + sd_port = config.getInteger("securitydomain.httpsadminport", -1); master_hostname = config.getString("preop.master.hostname", ""); - master_port = config.getInteger("preop.master.httpsport", -1); + master_port = config.getInteger("preop.master.httpsadminport", -1); String content = ""; if (cstype.equals("ca") || cstype.equals("kra")) { |