summaryrefslogtreecommitdiffstats
path: root/pki/base/common
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-04-18 21:53:00 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-04-18 21:53:00 +0000
commit8540495f09926b7a81e3778d67297f088bff1233 (patch)
tree5f6481c2c982c472fa40082a3fb7980e057903ae /pki/base/common
parentbe83abfb4327f886f706d71a93da889ad3988934 (diff)
downloadpki-8540495f09926b7a81e3778d67297f088bff1233.tar.gz
pki-8540495f09926b7a81e3778d67297f088bff1233.tar.xz
pki-8540495f09926b7a81e3778d67297f088bff1233.zip
Bugzilla Bug #496409 - Display missing "Security Domain" information on
Security Domain Login Panel git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@402 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common')
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java4
-rw-r--r--pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java4
2 files changed, 7 insertions, 1 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
index 41bac6413..4f0a19d8b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
@@ -66,8 +66,10 @@ public class SecurityDomainLogin extends BaseServlet {
subsystem = "DRM";
}
context.put("subsystem", subsystem);
+ // The "securitydomain.name" property ONLY resides in the "CS.cfg"
+ // associated with the CS subsystem hosting the security domain.
IConfigStore cs = CMS.getConfigStore();
- String sdname = cs.getString("preop.securitydomain.name", "");
+ String sdname = cs.getString("securitydomain.name", "");
context.put("name", sdname);
template = Velocity.getTemplate("admin/console/config/securitydomainloginpanel.vm");
} catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index 830d346e9..73ab1b07f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
@@ -280,12 +280,16 @@ public class SecurityDomainPanel extends WizardPanelBase {
CMS.getEENonSSLHost());
config.putString("preop.securitydomain.httpport",
CMS.getEENonSSLPort());
+ config.putString("securitydomain.httpport",
+ CMS.getEENonSSLPort());
config.putString("preop.securitydomain.httpsport",
CMS.getEESSLPort());
config.putString("securitydomain.httpsport",
CMS.getEESSLPort());
config.putString("preop.securitydomain.name",
HttpInput.getDomainName(request, "sdomainName"));
+ config.putString("securitydomain.name",
+ HttpInput.getDomainName(request, "sdomainName"));
// make sure the subsystem certificate is issued by the security
// domain