2 files changed, 46 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
index ac29b2da7..6482b5f42 100644
--- a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
+++ b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
@@ -721,4 +721,46 @@ public class ConfigurationRequest {
         this.stepTwo = stepTwo;
     }
 
+    @Override
+    public String toString() {
+        return "ConfigurationRequest [pin=XXXX" +
+               ", token=" + token + ", tokenPassword=XXXX" +
+               ", securityDomainType=" + securityDomainType +
+               ", securityDomainUri=" + securityDomainUri +
+               ", securityDomainName=" + securityDomainName +
+               ", securityDomainUser=" + securityDomainUser +
+               ", securityDomainPassword=XXXX" +
+               ", isClone=" + isClone +
+               ", cloneUri=" + cloneUri +
+               ", subsystemName=" + subsystemName +
+               ", p12File=" + p12File +
+               ", p12Password=XXXX" +
+               ", hierarchy=" + hierarchy +
+               ", dsHost=" + dsHost +
+               ", dsPort=" + dsPort +
+               ", baseDN=" + baseDN +
+               ", bindDN=" + bindDN +
+               ", bindpwd=XXXX" +
+               ", database=" + database +
+               ", secureConn=" + secureConn +
+               ", removeData=" + removeData +
+               ", masterReplicationPort=" + masterReplicationPort +
+               ", cloneReplicationPort=" + cloneReplicationPort +
+               ", replicationSecurity=" + replicationSecurity +
+               ", systemCerts=" + systemCerts +
+               ", issuingCA=" + issuingCA +
+               ", backupKeys=" + backupKeys +
+               ", backupPassword=XXXX" +
+               ", backupFile=" + backupFile +
+               ", adminUID=" + adminUID +
+               ", adminPassword=XXXX" +
+               ", adminEmail=" + adminEmail +
+               ", adminCertRequest=" + adminCertRequest +
+               ", adminCertRequestType=" + adminCertRequestType +
+               ", adminSubjectDN=" + adminSubjectDN +
+               ", adminName=" + adminName +
+               ", adminProfileID=" + adminProfileID +
+               ", stepTwo=" + stepTwo + "]";
+    }
+
 }
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
index 53b004846..4ae9579f2 100644
--- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigService.java
@@ -118,6 +118,9 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
             throw new PKIException("Unable to get certList from config file");
         }
 
+        CMS.debug("SystemConfigService(): configure() called");
+        CMS.debug(data.toString());
+
         validateData(data);
         ConfigurationResponse response = new ConfigurationResponse();
 
@@ -700,7 +703,7 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
         }
 
         try {
-            String dbuser = csType + "-" + CMS.getEEHost() + "-" + CMS.getEESSLPort();
+            String dbuser = csType + "-" + CMS.getEEHost() + "-" + cs.getString("service.securePort");
             if (! securityDomainType.equals(ConfigurationRequest.NEW_DOMAIN)) {
                 ConfigurationUtils.setupDBUser(dbuser);
             }