1 files changed, 10 insertions, 7 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 5fccf9004..339a92444 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
@@ -139,12 +139,15 @@ public class CreateSubsystemPanel extends WizardPanelBase {
             context.put("systemname", config.getString("preop.system.name"));
             context.put("fullsystemname", config.getString("preop.system.fullname"));
             context.put("machineName", config.getString("machineName"));
-            context.put("https_port", CMS.getEESSLPort());
             context.put("http_port", CMS.getEENonSSLPort());
+            context.put("https_agent_port", CMS.getAgentPort());
+            context.put("https_ee_port", CMS.getEESSLPort());
+            context.put("https_admin_port", CMS.getAdminPort());
         } catch (EBaseException e) {
         }
 
-        Vector v = getMasterUrlListFromSecurityDomain(config, cstype);
+        Vector v = getMasterUrlListFromSecurityDomain( config, cstype,
+                                                       "SecurePort" );
         StringBuffer list = new StringBuffer();
         int size = v.size();
         for (int i = 0; i < size; i++) {
@@ -247,18 +250,18 @@ public class CreateSubsystemPanel extends WizardPanelBase {
 
             URL u = new URL(url);
             String host = u.getHost();
-            int port = u.getPort();
+            int https_ee_port = u.getPort();
 
             config.putString("preop.master.hostname", host);
-            config.putInteger("preop.master.httpsport", port);
+            config.putInteger("preop.master.httpsport", https_ee_port);
 
             ConfigCertApprovalCallback certApprovalCallback = new ConfigCertApprovalCallback();
             if (cstype.equals("ca")) {
-                updateCertChain(config, "clone", host, port, true, context,
-                  certApprovalCallback);
+                updateCertChain( config, "clone", host, https_ee_port,
+                                 true, context, certApprovalCallback );
             }
 
-            getTokenInfo(config, cstype, host, port, true, context, 
+            getTokenInfo(config, cstype, host, https_ee_port, true, context, 
               certApprovalCallback);
         } else {
             CMS.debug("CreateSubsystemPanel: invalid choice " + select);